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

am: c06746ce46 Change-Id: I0ac3d9bf7af40f672f7ae482318c375041b28d12
2017-06-20 18:42:03 +00:00
parent ac371d0550 c06746ce46
commit ee7f5887d0
1 changed files with 4 additions and 2 deletions
--- a/services/print/java/com/android/server/print/UserState.java
+++ b/services/print/java/com/android/server/print/UserState.java
@@ -159,10 +159,12 @@ final class UserState implements PrintSpoolerCallbacks, PrintServiceCallbacks,
            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();
        }
    }