Merge "Expose LocationManager#getNetworkProviderPackage as @SystemApi"

2 files changed, 14 insertions, 0 deletions

diff --git a/api/system-current.txt b/api/system-current.txt
index afce431d49ec..cb0fe3f88d08 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -2615,6 +2615,7 @@ package android.location {
     method public deprecated boolean addGpsNavigationMessageListener(android.location.GpsNavigationMessageEvent.Listener);
     method public void flushGnssBatch();
     method public int getGnssBatchSize();
+    method public java.lang.String getNetworkProviderPackage();
     method public boolean isLocationEnabledForUser(android.os.UserHandle);
     method public boolean isProviderEnabledForUser(java.lang.String, android.os.UserHandle);
     method public boolean registerGnssBatchedLocationCallback(long, boolean, android.location.BatchedLocationCallback, android.os.Handler);
diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java
index b5d94315f97f..6d10c2d692b1 100644
--- a/location/java/android/location/LocationManager.java
+++ b/location/java/android/location/LocationManager.java
@@ -2378,4 +2378,17 @@ public class LocationManager {
             throw new IllegalArgumentException("invalid geofence: " + fence);
         }
     }
+
+    /**
+     * @hide
+     */
+    @SystemApi
+    public String getNetworkProviderPackage() {
+        try {
+            return mService.getNetworkProviderPackage();
+        } catch (RemoteException e) {
+            e.rethrowFromSystemServer();
+            return null;
+        }
+    }
 }