Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "PrintManagerService: Don't prune services on all package change events." into oc-mr1-dev am: 735ed6c011

Browse Source 
am: e81a350a45

Change-Id: I3964de47b70c27c372d80cfce5107fd216ded6cd
This commit is contained in:
Narayan Kamath
2017-08-01 11:57:28 +00:00
committed by android-build-merger
parent 1627b03b3d e81a350a45
commit 0515c80d01
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/print/java/com/android/server/print/PrintManagerService.java
View File

@@ -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