commit c3fabdcad3e6987d1909cefdb1ad984f8ca0b700
author Wei Wang <weiwa@google.com> Tue Dec 10 21:03:03 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 10 21:03:03 2019 +0000
tree 78e98dcfb26bd787ef4700a869aba254b08f4ba5
parent 0bfdf247710a3f00b4f50128454fc9477205bca8
parent 621e4cf50491c9afa0a14a5fe408120c640668e4

Merge "Expose FUSED_PROVIDER to test API."

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index 3e14469..acea9aa 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -1151,6 +1151,7 @@
     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 {

location/java/android/location/LocationManager.java

diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java
index 1f8c1d53..5496148 100644
--- a/location/java/android/location/LocationManager.java
+++ b/location/java/android/location/LocationManager.java
@@ -125,6 +125,7 @@
      *
      * @hide
      */
+    @TestApi
     public static final String FUSED_PROVIDER = "fused";
 
     /**