commit aa420d5e1432d8669ecc10a52246e734b4eea156
author Wyatt Riley <wyattriley@google.com> Mon Jul 03 15:14:42 2017 -0700
committer Wyatt Riley <wyattriley@google.com> Fri Jul 21 14:47:57 2017 -0700
tree 10cf538f07022bfcece87d2278a49cc1fcb67811
parent dc7b2bc5e3b1d00f02b5c9a9dc8fde2a3c459bff

Fix RemoteListenerHelper vs. HAL deadlock

Releasing lock before calling into HAL.

Fixes: 62776535
Bug: 63264577
Test: Build, GNSS location & GnssMeasurement toggling
Reproed issue with test sleep code without fix and passed with.

Change-Id: I44e183e98edd972619a068bbcc95468e9a9cdee1

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

diff --git a/services/core/java/com/android/server/LocationManagerService.java b/services/core/java/com/android/server/LocationManagerService.java
index 7275461..a4e673d 100644
--- a/services/core/java/com/android/server/LocationManagerService.java
+++ b/services/core/java/com/android/server/LocationManagerService.java
@@ -243,8 +243,9 @@
 
     private GnssLocationProvider.GnssSystemInfoProvider mGnssSystemInfoProvider;
 
-    private GnssLocationProvider.GnssBatchingProvider mGnssBatchingProvider;
     private GnssLocationProvider.GnssMetricsProvider mGnssMetricsProvider;
+
+    private GnssLocationProvider.GnssBatchingProvider mGnssBatchingProvider;
     private IBatchedLocationCallback mGnssBatchingCallback;
     private LinkedCallback mGnssBatchingDeathCallback;
     private boolean mGnssBatchingInProgress = false;