diff options
| author | Wei Wang <weiwa@google.com> | 2019-12-10 21:03:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-12-10 21:03:03 +0000 |
| commit | c3fabdcad3e6987d1909cefdb1ad984f8ca0b700 (patch) | |
| tree | 78e98dcfb26bd787ef4700a869aba254b08f4ba5 | |
| parent | 0bfdf247710a3f00b4f50128454fc9477205bca8 (diff) | |
| parent | 621e4cf50491c9afa0a14a5fe408120c640668e4 (diff) | |
Merge "Expose FUSED_PROVIDER to test API."
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | location/java/android/location/LocationManager.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/test-current.txt b/api/test-current.txt index 3e144697ee28..acea9aada1a6 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -1151,6 +1151,7 @@ package android.location { method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(@Nullable android.location.LocationRequest, @NonNull java.util.concurrent.Executor, @NonNull android.location.LocationListener); method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(@Nullable android.location.LocationRequest, @NonNull android.app.PendingIntent); method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void setLocationEnabledForUser(boolean, @NonNull android.os.UserHandle); + field public static final String FUSED_PROVIDER = "fused"; } public final class LocationRequest implements android.os.Parcelable { diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java index 1f8c1d5352b0..5496148f3fd4 100644 --- a/location/java/android/location/LocationManager.java +++ b/location/java/android/location/LocationManager.java @@ -125,6 +125,7 @@ public class LocationManager { * * @hide */ + @TestApi public static final String FUSED_PROVIDER = "fused"; /** |