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

Browse Source 
am: 735ed6c011

Change-Id: I320bc044611da195b13b5976b827a70edc71bcb3
This commit is contained in:
Narayan Kamath
2017-08-01 11:46:53 +00:00
committed by android-build-merger
parent bc66bdc72a 735ed6c011
commit e81a350a45
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -736,15 +736,19 @@ public final class PrintManagerService extends SystemService {
UserState userState = getOrCreateUserStateLocked(getChangingUserId(), false, UserState userState = getOrCreateUserStateLocked(getChangingUserId(), false,
false /* enforceUserUnlockingOrUnlocked */); false /* enforceUserUnlockingOrUnlocked */);
boolean prunePrintServices = false;
synchronized (mLock) { synchronized (mLock) {
if (hadPrintService(userState, packageName) if (hadPrintService(userState, packageName)
|| hasPrintService(packageName)) { || hasPrintService(packageName)) {
userState.updateIfNeededLocked(); userState.updateIfNeededLocked();
prunePrintServices = true;
} }
} }
if (prunePrintServices) {
userState.prunePrintServices(); userState.prunePrintServices();
} }
}
@Override @Override
public void onPackageRemoved(String packageName, int uid) { public void onPackageRemoved(String packageName, int uid) {
@@ -752,14 +756,18 @@ public final class PrintManagerService extends SystemService {
UserState userState = getOrCreateUserStateLocked(getChangingUserId(), false, UserState userState = getOrCreateUserStateLocked(getChangingUserId(), false,
false /* enforceUserUnlockingOrUnlocked */); false /* enforceUserUnlockingOrUnlocked */);
boolean prunePrintServices = false;
synchronized (mLock) { synchronized (mLock) {
if (hadPrintService(userState, packageName)) { if (hadPrintService(userState, packageName)) {
userState.updateIfNeededLocked(); userState.updateIfNeededLocked();
prunePrintServices = true;
} }
} }
if (prunePrintServices) {
userState.prunePrintServices(); userState.prunePrintServices();
} }
}
@Override @Override
public boolean onHandleForceStop(Intent intent, String[] stoppedPackages, public boolean onHandleForceStop(Intent intent, String[] stoppedPackages,