commit 1b11264256cf3d6968ee0a43485914be00e61ce9
author Yu-Han Yang <yuhany@google.com> Wed Jun 10 14:30:38 2020 -0700
committer Yu-Han Yang <yuhany@google.com> Wed Jun 10 17:04:35 2020 -0700
tree ce30352455960e77e85848dab5c37339307bf1d9
parent 903e0db40591d7973f7077ae42dd87c7d4def37a

Do not hold mLock when calling GNSS HAL

Test: on device
Bug: 156867071
Change-Id: I57c3bfb8148350855af1dc4b662526a4e6043b8e

services/core/java/com/android/server/location/LocationManagerService.java

diff --git a/services/core/java/com/android/server/location/LocationManagerService.java b/services/core/java/com/android/server/location/LocationManagerService.java
index 21926be..f7fe5f0 100644
--- a/services/core/java/com/android/server/location/LocationManagerService.java
+++ b/services/core/java/com/android/server/location/LocationManagerService.java
@@ -206,7 +206,7 @@
 
     private final GeofenceManager mGeofenceManager;
 
-    @Nullable private GnssManagerService mGnssManagerService = null;
+    @Nullable private volatile GnssManagerService mGnssManagerService = null;
 
     private final PassiveLocationProviderManager mPassiveManager;
 
@@ -359,6 +359,10 @@
             // prepare providers
             initializeProvidersLocked();
         }
+
+        // initialize gnss last because it has no awareness of boot phases and blindly assumes that
+        // all other location providers are loaded at initialization
+        initializeGnss();
     }
 
     private void onAppOpChanged(String packageName) {
@@ -580,16 +584,19 @@
             }
             manager.setMockProvider(new MockProvider(properties));
         }
+    }
 
-        // initialize gnss last because it has no awareness of boot phases and blindly assumes that
-        // all other location providers are loaded at initialization
+    private void initializeGnss() {
+        // Do not hold mLock when calling GnssManagerService#isGnssSupported() which calls into HAL.
         if (GnssManagerService.isGnssSupported()) {
             mGnssManagerService = new GnssManagerService(mContext, mUserInfoHelper, mSettingsHelper,
                     mAppOpsHelper, mAppForegroundHelper, mLocationUsageLogger);
             mGnssManagerService.onSystemReady();
 
             LocationProviderManager gnssManager = new LocationProviderManager(GPS_PROVIDER);
-            mProviderManagers.add(gnssManager);
+            synchronized (mLock) {
+                mProviderManagers.add(gnssManager);
+            }
             gnssManager.setRealProvider(mGnssManagerService.getGnssLocationProvider());
 
             // bind to geofence proxy