diff options
| author | 2024-11-19 20:11:16 +0000 | |
|---|---|---|
| committer | 2024-11-19 20:11:16 +0000 | |
| commit | b58bcfdcc2a83ab8328e729e1651b11d59c2cb66 (patch) | |
| tree | 69adbbd471883c31144544a90616e351d0a17935 | |
| parent | e46861eaa89975e1c6f2473ec1bb90ee7da91250 (diff) | |
| parent | ce335d19e4398975471bc661a9f4f935806519a7 (diff) | |
Merge "Add BYPASS_CONCURRENT_RECORD_AUDIO_RESTRICTION to permission cache" into main
| -rw-r--r-- | services/core/java/com/android/server/audio/AudioServerPermissionProvider.java | 4 | ||||
| -rw-r--r-- | services/core/java/com/android/server/audio/AudioService.java | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/audio/AudioServerPermissionProvider.java b/services/core/java/com/android/server/audio/AudioServerPermissionProvider.java index 5283eddd90fb..473691874262 100644 --- a/services/core/java/com/android/server/audio/AudioServerPermissionProvider.java +++ b/services/core/java/com/android/server/audio/AudioServerPermissionProvider.java @@ -24,6 +24,7 @@ import static android.Manifest.permission.CAPTURE_AUDIO_OUTPUT; import static android.Manifest.permission.CAPTURE_MEDIA_OUTPUT; import static android.Manifest.permission.CAPTURE_TUNER_AUDIO_INPUT; import static android.Manifest.permission.CAPTURE_VOICE_COMMUNICATION_OUTPUT; +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_SETTINGS; import static android.Manifest.permission.MODIFY_DEFAULT_AUDIO_EFFECTS; @@ -37,7 +38,6 @@ import android.os.Trace; import android.os.UserHandle; import android.util.ArraySet; import android.util.IntArray; -import android.util.Slog; import com.android.internal.annotations.GuardedBy; import com.android.media.permission.INativePermissionController; @@ -82,6 +82,8 @@ public class AudioServerPermissionProvider { MONITORED_PERMS[PermissionEnum.CAPTURE_VOICE_COMMUNICATION_OUTPUT] = CAPTURE_VOICE_COMMUNICATION_OUTPUT; MONITORED_PERMS[PermissionEnum.BLUETOOTH_CONNECT] = BLUETOOTH_CONNECT; + MONITORED_PERMS[PermissionEnum.BYPASS_CONCURRENT_RECORD_AUDIO_RESTRICTION] = + BYPASS_CONCURRENT_RECORD_AUDIO_RESTRICTION; } private final Object mLock = new Object(); diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index 6e6bf80e8c09..40d5f86f8094 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -49,6 +49,7 @@ import static android.media.AudioManager.RINGER_MODE_VIBRATE; import static android.media.AudioManager.STREAM_SYSTEM; import static android.media.audio.Flags.autoPublicVolumeApiHardening; import static android.media.audio.Flags.automaticBtDeviceType; +import static android.media.audio.Flags.concurrentAudioRecordBypassPermission; import static android.media.audio.Flags.featureSpatialAudioHeadtrackingLowLatency; import static android.media.audio.Flags.focusFreezeTestApi; import static android.media.audio.Flags.roForegroundAudioControl; @@ -4888,6 +4889,8 @@ public class AudioService extends IAudioService.Stub + equalScoLeaVcIndexRange()); pw.println("\tcom.android.media.audio.ringMyCar:" + ringMyCar()); + pw.println("\tandroid.media.audio.Flags.concurrentAudioRecordBypassPermission:" + + concurrentAudioRecordBypassPermission()); } private void dumpAudioMode(PrintWriter pw) { |