Merge "Grant CAPTURE_AUDIO_OUTPUT permission for trusted process" into tm-dev (d2a02887) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.server.pm.permission;

		import static android.Manifest.permission.CAPTURE_AUDIO_HOTWORD;
		import static android.Manifest.permission.CAPTURE_AUDIO_OUTPUT;
		import static android.Manifest.permission.RECORD_AUDIO;
		import static android.Manifest.permission.UPDATE_APP_OPS_STATS;
		import static android.app.AppOpsManager.ATTRIBUTION_CHAIN_ID_NONE;
		@@ -1364,8 +1365,8 @@ public class PermissionManagerService extends IPermissionManager.Stub {
		// the only use case for this, so simply override here.
		if (!permissionGranted
		&& Process.isIsolated(uid) // simple check which fails-fast for the common case
		&& (permission.equals(RECORD_AUDIO)
		\|\| permission.equals(CAPTURE_AUDIO_HOTWORD))) {
		&& (permission.equals(RECORD_AUDIO) \|\| permission.equals(CAPTURE_AUDIO_HOTWORD)
		\|\| permission.equals(CAPTURE_AUDIO_OUTPUT))) {
		HotwordDetectionServiceProvider hotwordServiceProvider =
		permissionManagerServiceInt.getHotwordDetectionServiceProvider();
		permissionGranted = hotwordServiceProvider != null

+2 −2

Original line number	Diff line number	Diff line
		@@ -449,8 +449,8 @@ public interface PermissionManagerServiceInternal extends PermissionManagerInter

		/**
		* Provides the uid of the currently active
		* {@link android.service.voice.HotwordDetectionService}, which should be granted RECORD_AUDIO
		* and CAPTURE_AUDIO_HOTWORD permissions.
		* {@link android.service.voice.HotwordDetectionService}, which should be granted RECORD_AUDIO,
		* CAPTURE_AUDIO_HOTWORD and CAPTURE_AUDIO_OUTPUT permissions.
		*/
		interface HotwordDetectionServiceProvider {
		int getUid();