Merge "Check that network provider exists before use"

2020-11-21 02:21:13 +00:00
parent 25d0505f9d 4f8600851e
commit c80f9ed597
1 changed files with 4 additions and 2 deletions
--- a/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java
+++ b/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java
@@ -709,8 +709,10 @@ public class GnssLocationProvider extends AbstractLocationProvider implements
                        "GNSS HAL Requesting location updates from %s provider for %d millis.",
                        provider, durationMillis));

-        locationManager.requestLocationUpdates(provider, locationRequest.build(),
-                DIRECT_EXECUTOR, locationListener);
+        if (locationManager.getProvider(provider) != null) {
+            locationManager.requestLocationUpdates(provider, locationRequest.build(),
+                    DIRECT_EXECUTOR, locationListener);
+        }
    }

    private void injectBestLocation(Location location) {