Merge "Add permission cache for MODIFY_AUDIO_SETTINGS_PRIVILEGED." into main (ac37f0f6) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/audio/AudioServerPermissionProvider.java

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -27,6 +27,7 @@ import static android.Manifest.permission.CAPTURE_VOICE_COMMUNICATION_OUTPUT;
	import static android.Manifest.permission.BYPASS_CONCURRENT_RECORD_AUDIO_RESTRICTION;		import static android.Manifest.permission.BYPASS_CONCURRENT_RECORD_AUDIO_RESTRICTION;
	import static android.Manifest.permission.MODIFY_AUDIO_ROUTING;		import static android.Manifest.permission.MODIFY_AUDIO_ROUTING;
	import static android.Manifest.permission.MODIFY_AUDIO_SETTINGS;		import static android.Manifest.permission.MODIFY_AUDIO_SETTINGS;
			import static android.Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED;
	import static android.Manifest.permission.MODIFY_DEFAULT_AUDIO_EFFECTS;		import static android.Manifest.permission.MODIFY_DEFAULT_AUDIO_EFFECTS;
	import static android.Manifest.permission.MODIFY_PHONE_STATE;		import static android.Manifest.permission.MODIFY_PHONE_STATE;
	import static android.Manifest.permission.RECORD_AUDIO;		import static android.Manifest.permission.RECORD_AUDIO;
	@@ -84,6 +85,8 @@ public class AudioServerPermissionProvider {
	MONITORED_PERMS[PermissionEnum.BLUETOOTH_CONNECT] = BLUETOOTH_CONNECT;		MONITORED_PERMS[PermissionEnum.BLUETOOTH_CONNECT] = BLUETOOTH_CONNECT;
	MONITORED_PERMS[PermissionEnum.BYPASS_CONCURRENT_RECORD_AUDIO_RESTRICTION] =		MONITORED_PERMS[PermissionEnum.BYPASS_CONCURRENT_RECORD_AUDIO_RESTRICTION] =
	BYPASS_CONCURRENT_RECORD_AUDIO_RESTRICTION;		BYPASS_CONCURRENT_RECORD_AUDIO_RESTRICTION;
			MONITORED_PERMS[PermissionEnum.MODIFY_AUDIO_SETTINGS_PRIVILEGED] =
			MODIFY_AUDIO_SETTINGS_PRIVILEGED;
	}		}

	private final Object mLock = new Object();		private final Object mLock = new Object();