Skip to content

Commit

Permalink
Merge "Build com.android.location.provider with java_sdk_library"
Browse files Browse the repository at this point in the history
am: aa5d8df

Change-Id: I53720ed4fcbe9f00f2f1f607d07efa9adaaf7bb4
  • Loading branch information
Sundong Ahn authored and android-build-merger committed Jun 15, 2018
2 parents 7bb253d + aa5d8df commit abdaa31
Show file tree
Hide file tree
Showing 10 changed files with 69 additions and 86 deletions.
1 change: 1 addition & 0 deletions CleanSpec.mk
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framew
$(call add-clean-step, rm -rf $(OUT_DIR)/host/common/obj/JAVA_LIBRARIES/platformprotos_intermediates)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/statsdprotolite_intermediates)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/com.android.mediadrm.signer.jar)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/com.android.location.provider.jar)
# ******************************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER
# ******************************************************************
21 changes: 21 additions & 0 deletions location/lib/Android.bp
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
//
// Copyright (C) 2018 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//

java_sdk_library {
name: "com.android.location.provider",
srcs: ["java/**/*.java"],
api_packages: ["com.android.location.provider"],
}
66 changes: 0 additions & 66 deletions location/lib/Android.mk

This file was deleted.

47 changes: 47 additions & 0 deletions location/lib/api/current.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
package com.android.location.provider {

public abstract deprecated class FusedProvider {
ctor public FusedProvider();
method public android.os.IBinder getBinder();
}

public abstract class LocationProviderBase {
ctor public LocationProviderBase(java.lang.String, com.android.location.provider.ProviderPropertiesUnbundled);
method public android.os.IBinder getBinder();
method public abstract void onDisable();
method public void onDump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);
method public abstract void onEnable();
method public abstract int onGetStatus(android.os.Bundle);
method public abstract long onGetStatusUpdateTime();
method public boolean onSendExtraCommand(java.lang.String, android.os.Bundle);
method public abstract void onSetRequest(com.android.location.provider.ProviderRequestUnbundled, android.os.WorkSource);
method public final void reportLocation(android.location.Location);
field public static final java.lang.String EXTRA_NO_GPS_LOCATION = "noGPSLocation";
field public static final java.lang.String FUSED_PROVIDER = "fused";
}

public final class LocationRequestUnbundled {
method public long getFastestInterval();
method public long getInterval();
method public int getQuality();
method public float getSmallestDisplacement();
field public static final int ACCURACY_BLOCK = 102; // 0x66
field public static final int ACCURACY_CITY = 104; // 0x68
field public static final int ACCURACY_FINE = 100; // 0x64
field public static final int POWER_HIGH = 203; // 0xcb
field public static final int POWER_LOW = 201; // 0xc9
field public static final int POWER_NONE = 200; // 0xc8
}

public final class ProviderPropertiesUnbundled {
method public static com.android.location.provider.ProviderPropertiesUnbundled create(boolean, boolean, boolean, boolean, boolean, boolean, boolean, int, int);
}

public final class ProviderRequestUnbundled {
method public long getInterval();
method public java.util.List<com.android.location.provider.LocationRequestUnbundled> getLocationRequests();
method public boolean getReportLocation();
}

}

Empty file added location/lib/api/removed.txt
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
20 changes: 0 additions & 20 deletions location/lib/com.android.location.provider.xml

This file was deleted.

0 comments on commit abdaa31

Please sign in to comment.