diff options
| author | 2017-08-01 11:46:53 +0000 | |
|---|---|---|
| committer | 2017-08-01 11:46:53 +0000 | |
| commit | e81a350a452d58b53a06a1d89410668628a0f60b (patch) | |
| tree | 41c1db5cca21dba930a9d2496594c8f18d126ebb | |
| parent | bc66bdc72a5d84b9c1eaa94c81a57b288c5e561c (diff) | |
| parent | 735ed6c0117d0392e09b0d4f38d807ac45ed10b7 (diff) | |
Merge "PrintManagerService: Don't prune services on all package change events." into oc-mr1-dev
am: 735ed6c011
Change-Id: I320bc044611da195b13b5976b827a70edc71bcb3
| -rw-r--r-- | services/print/java/com/android/server/print/PrintManagerService.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/services/print/java/com/android/server/print/PrintManagerService.java b/services/print/java/com/android/server/print/PrintManagerService.java index 6c417a9baf93..5121c29d688d 100644 --- a/services/print/java/com/android/server/print/PrintManagerService.java +++ b/services/print/java/com/android/server/print/PrintManagerService.java @@ -736,14 +736,18 @@ public final class PrintManagerService extends SystemService { UserState userState = getOrCreateUserStateLocked(getChangingUserId(), false, false /* enforceUserUnlockingOrUnlocked */); + boolean prunePrintServices = false; synchronized (mLock) { if (hadPrintService(userState, packageName) || hasPrintService(packageName)) { userState.updateIfNeededLocked(); + prunePrintServices = true; } } - userState.prunePrintServices(); + if (prunePrintServices) { + userState.prunePrintServices(); + } } @Override @@ -752,13 +756,17 @@ public final class PrintManagerService extends SystemService { UserState userState = getOrCreateUserStateLocked(getChangingUserId(), false, false /* enforceUserUnlockingOrUnlocked */); + boolean prunePrintServices = false; synchronized (mLock) { if (hadPrintService(userState, packageName)) { userState.updateIfNeededLocked(); + prunePrintServices = true; } } - userState.prunePrintServices(); + if (prunePrintServices) { + userState.prunePrintServices(); + } } @Override |