Merge "PrintManagerService: Don't prune services on all package change events." into oc-mr1-dev (e81a350a) · Commits · e / os / android_frameworks_base

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

+10 −2

Original line number	Diff line number	Diff line
		@@ -736,15 +736,19 @@ 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;
		}
		}

		if (prunePrintServices) {
		userState.prunePrintServices();
		}
		}

		@Override
		public void onPackageRemoved(String packageName, int uid) {
		@@ -752,14 +756,18 @@ 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;
		}
		}

		if (prunePrintServices) {
		userState.prunePrintServices();
		}
		}

		@Override
		public boolean onHandleForceStop(Intent intent, String[] stoppedPackages,