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

am: b124bea782 Change-Id: Ie93b79dfff5787cb9835c4ba86e3aa586e0d2ad8
2017-06-13 20:41:03 +00:00
parent 717b5bf3e0 b124bea782
commit 60246acdbf
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
@@ -154,10 +154,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();
        }
    }