commit ee7f5887d0fd268fdd96fddf5f58ce339cb33a29
author Philip P. Moltmann <moltmann@google.com> Tue Jun 20 18:42:03 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jun 20 18:42:03 2017 +0000
tree 5d4cca718efc7f1672aa9531ae3e60b9e8c88cbf
parent ac371d0550dc4f434010482a76e0c9b3d5f01de9
parent c06746ce46ec3138a8203bc0cd140cc9eb73344d

Merge "remove the lock-use for prunePrintService in case blocking main thread" into oc-dev
am: c06746ce46

Change-Id: I0ac3d9bf7af40f672f7ae482318c375041b28d12

services/print/java/com/android/server/print/UserState.java

diff --git a/services/print/java/com/android/server/print/UserState.java b/services/print/java/com/android/server/print/UserState.java
index 75df892..5770c50 100644
--- a/services/print/java/com/android/server/print/UserState.java
+++ b/services/print/java/com/android/server/print/UserState.java
@@ -159,10 +159,12 @@
             readInstalledPrintServicesLocked();
             upgradePersistentStateIfNeeded();
             readDisabledPrintServicesLocked();
+        }
 
-            // Some print services might have gotten installed before the User State came up
-            prunePrintServices();
+        // Some print services might have gotten installed before the User State came up
+        prunePrintServices();
 
+        synchronized (mLock) {
             onConfigurationChangedLocked();
         }
     }