diff options
| author | Narayan Kamath <narayan@google.com> | 2017-08-01 11:57:28 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-01 11:57:28 +0000 |
| commit | 0515c80d01a883da4c375179e8fb4a25ac901eb2 (patch) | |
| tree | 07f7781cf6183252420537efb9a8aec91a1a2580 /services/print | |
| parent | 1627b03b3d01720bc74a413e6a5a6cc4aa445554 (diff) | |
| parent | e81a350a452d58b53a06a1d89410668628a0f60b (diff) | |
Merge "PrintManagerService: Don't prune services on all package change events." into oc-mr1-dev am: 735ed6c011
am: e81a350a45
Change-Id: I3964de47b70c27c372d80cfce5107fd216ded6cd
Diffstat (limited to 'services/print')
| -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 33d1fed4ef56..6a6b542f9bb6 100644 --- a/services/print/java/com/android/server/print/PrintManagerService.java +++ b/services/print/java/com/android/server/print/PrintManagerService.java @@ -782,14 +782,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 @@ -798,13 +802,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 |