From 11a0b63bb47b218a65b7634cbb4cbf5b852e9bfa Mon Sep 17 00:00:00 2001 From: Soonil Nagarkar Date: Wed, 11 Nov 2020 11:16:53 -0800 Subject: [PATCH] Make FUSED_PROVIDER SystemApi This should always have been SystemApi, as most fused providers are implemented outside system server. There is a strong argument this should actually be public API, but I'm punting on that for now until we can give it more consideration. Bug: 173030969 Test: none Change-Id: If5ba10accbe2f6ce47d749536d053e1bd8e297f8 --- api/system-current.txt | 1 + core/api/system-current.txt | 1 + location/java/android/location/LocationManager.java | 1 + 3 files changed, 3 insertions(+) diff --git a/api/system-current.txt b/api/system-current.txt index 0eaebcef0040d..e94a3b2f74af4 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -4190,6 +4190,7 @@ package android.location { method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void setLocationEnabledForUser(boolean, @NonNull android.os.UserHandle); method @Deprecated @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean setProviderEnabledForUser(@NonNull String, boolean, @NonNull android.os.UserHandle); method @Deprecated @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public boolean unregisterGnssBatchedLocationCallback(@NonNull android.location.BatchedLocationCallback); + field public static final String FUSED_PROVIDER = "fused"; } public final class LocationRequest implements android.os.Parcelable { diff --git a/core/api/system-current.txt b/core/api/system-current.txt index ed3b7deaad54d..d38056082a66f 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -4130,6 +4130,7 @@ package android.location { method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void setLocationEnabledForUser(boolean, @NonNull android.os.UserHandle); method @Deprecated @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean setProviderEnabledForUser(@NonNull String, boolean, @NonNull android.os.UserHandle); method @Deprecated @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public boolean unregisterGnssBatchedLocationCallback(@NonNull android.location.BatchedLocationCallback); + 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 4fbcfe16feb70..047b809bc766f 100644 --- a/location/java/android/location/LocationManager.java +++ b/location/java/android/location/LocationManager.java @@ -202,6 +202,7 @@ public class LocationManager { * * @hide */ + @SystemApi @TestApi public static final String FUSED_PROVIDER = "fused";