Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b58bcfdc authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add BYPASS_CONCURRENT_RECORD_AUDIO_RESTRICTION to permission cache" into main

parents e46861ea ce335d19

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

+3 −1
Original line number Diff line number Diff line
@@ -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();

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

+3 −0
Original line number Diff line number Diff line
@@ -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) {