Merge "Skip to wait app killed mechanism if no active uid" into main (5ebe1ec4) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/KillAppBlocker.java

+7 −3

Original line number	Diff line number	Diff line
		@@ -83,13 +83,13 @@ final class KillAppBlocker {
		}
		}

		void waitAppProcessGone(ActivityManagerInternal mAmi, Computer snapshot,
		void waitAppProcessGone(ActivityManagerInternal ami, Computer snapshot,
		UserManagerService userManager, String packageName) {
		if (!mRegistered) {
		return;
		}
		synchronized (this) {
		if (mAmi != null) {
		if (ami != null) {
		int[] users = userManager.getUserIds();

		for (int i = 0; i < users.length; i++) {
		@@ -97,12 +97,16 @@ final class KillAppBlocker {
		final int uid = snapshot.getPackageUidInternal(
		packageName, MATCH_ALL, userId, Process.SYSTEM_UID);
		if (uid != INVALID_UID) {
		if (mAmi.getUidProcessState(uid) != PROCESS_STATE_NONEXISTENT) {
		if (ami.getUidProcessState(uid) != PROCESS_STATE_NONEXISTENT) {
		mActiveUids.add(uid);
		}
		}
		}
		}
		if (mActiveUids.size() == 0) {
		// no active uid
		return;
		}
		}

		try {