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

am: 60246acdbf Change-Id: If773ac8166bee1e92168f4df7a9de2dd7cea190f
2017-06-13 20:48:10 +00:00
parent 8532bc3b59 60246acdbf
commit a76f1cbd1d
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();
        }
    }