Merge "Handle race condition in isKnownIsolatedComputeApp" into main (6cede5e5) · Commits · e / os / android_frameworks_base

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

+5 −3

Original line number	Diff line number	Diff line
		@@ -143,6 +143,7 @@ import com.android.server.ondeviceintelligence.OnDeviceIntelligenceManagerLocal;
		import com.android.server.pm.parsing.PackageInfoUtils;
		import com.android.server.pm.parsing.pkg.AndroidPackageUtils;
		import com.android.server.pm.permission.PermissionManagerServiceInternal;
		import com.android.server.pm.permission.PermissionManagerServiceInternal.HotwordDetectionServiceProvider;
		import com.android.server.pm.pkg.AndroidPackage;
		import com.android.server.pm.pkg.PackageState;
		import com.android.server.pm.pkg.PackageStateInternal;
		@@ -5780,10 +5781,11 @@ public class ComputerEngine implements Computer {
		if (!Process.isIsolatedUid(uid)) {
		return false;
		}
		final HotwordDetectionServiceProvider hotwordDetectionServiceProvider =
		mPermissionManager.getHotwordDetectionServiceProvider();
		final boolean isHotword =
		mPermissionManager.getHotwordDetectionServiceProvider() != null
		&& uid
		== mPermissionManager.getHotwordDetectionServiceProvider().getUid();
		hotwordDetectionServiceProvider != null
		&& uid == hotwordDetectionServiceProvider.getUid();
		if (isHotword) {
		return true;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -475,7 +475,7 @@ public interface PermissionManagerServiceInternal extends PermissionManagerInter
		* {@link android.service.voice.HotwordDetectionService}, which should be granted RECORD_AUDIO,
		* CAPTURE_AUDIO_HOTWORD and CAPTURE_AUDIO_OUTPUT permissions.
		*/
		interface HotwordDetectionServiceProvider {
		public interface HotwordDetectionServiceProvider {
		int getUid();
		}
		}