Merge "[pm] fix crash caused by race condition onUidGone" into udc-dev (a3aa00e2) · Commits · e / os / android_frameworks_base

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

+12 −2

Original line number	Diff line number	Diff line
		@@ -4311,7 +4311,12 @@ public class ComputerEngine implements Computer {
		if (Process.isIsolatedUid(uid)
		&& mPermissionManager.getHotwordDetectionServiceProvider() != null
		&& uid == mPermissionManager.getHotwordDetectionServiceProvider().getUid()) {
		try {
		uid = getIsolatedOwner(uid);
		} catch (IllegalStateException e) {
		// If the owner uid doesn't exist, just use the current uid
		Slog.wtf(TAG, "Expected isolated uid " + uid + " to have an owner", e);
		}
		}
		final int callingUserId = UserHandle.getUserId(callingUid);
		final int appId = UserHandle.getAppId(uid);
		@@ -4352,7 +4357,12 @@ public class ComputerEngine implements Computer {
		if (Process.isIsolatedUid(uid)
		&& mPermissionManager.getHotwordDetectionServiceProvider() != null
		&& uid == mPermissionManager.getHotwordDetectionServiceProvider().getUid()) {
		try {
		uid = getIsolatedOwner(uid);
		} catch (IllegalStateException e) {
		// If the owner uid doesn't exist, just use the current uid
		Slog.wtf(TAG, "Expected isolated uid " + uid + " to have an owner", e);
		}
		}
		final int appId = UserHandle.getAppId(uid);
		final Object obj = mSettings.getSettingBase(appId);