Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60246acd authored by yangbingqian's avatar yangbingqian Committed by android-build-merger
Browse files

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

am: b124bea7

Change-Id: Ie93b79dfff5787cb9835c4ba86e3aa586e0d2ad8
parents 717b5bf3 b124bea7

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

+4 −2
Original line number Original line Diff line number Diff line
@@ -154,10 +154,12 @@ final class UserState implements PrintSpoolerCallbacks, PrintServiceCallbacks, 
            readInstalledPrintServicesLocked();

            readInstalledPrintServicesLocked();

            upgradePersistentStateIfNeeded();

            upgradePersistentStateIfNeeded();

            readDisabledPrintServicesLocked();

            readDisabledPrintServicesLocked();

        }





        // Some print services might have gotten installed before the User State came up

        // Some print services might have gotten installed before the User State came up

        prunePrintServices();

        prunePrintServices();





        synchronized (mLock) {

            onConfigurationChangedLocked();

            onConfigurationChangedLocked();

        }

        }

    }

    }