Merge "Merge "Allow package names to be retrieved for HotwordDetectionService"... (27160077) · Commits · e / os / android_frameworks_base

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -4298,6 +4298,11 @@ public class ComputerEngine implements Computer {
		if (Process.isSdkSandboxUid(uid)) {
		uid = getBaseSdkSandboxUid();
		}
		if (Process.isIsolatedUid(uid)
		&& mPermissionManager.getHotwordDetectionServiceProvider() != null
		&& uid == mPermissionManager.getHotwordDetectionServiceProvider().getUid()) {
		uid = getIsolatedOwner(uid);
		}
		final int callingUserId = UserHandle.getUserId(callingUid);
		final int appId = UserHandle.getAppId(uid);
		final Object obj = mSettings.getSettingBase(appId);
		@@ -4334,6 +4339,11 @@ public class ComputerEngine implements Computer {
		if (Process.isSdkSandboxUid(uid)) {
		uid = getBaseSdkSandboxUid();
		}
		if (Process.isIsolatedUid(uid)
		&& mPermissionManager.getHotwordDetectionServiceProvider() != null
		&& uid == mPermissionManager.getHotwordDetectionServiceProvider().getUid()) {
		uid = getIsolatedOwner(uid);
		}
		final int appId = UserHandle.getAppId(uid);
		final Object obj = mSettings.getSettingBase(appId);
		if (obj instanceof SharedUserSetting) {