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

Commit 1ab7b554 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "Add BYPASS_CONCURRENT_RECORD_AUDIO_RESTRICTION permission" into main

parents a496bc01 4c254b9f

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ package android { 
    field public static final String BRIGHTNESS_SLIDER_USAGE = "android.permission.BRIGHTNESS_SLIDER_USAGE";

    field public static final String BROADCAST_CLOSE_SYSTEM_DIALOGS = "android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS";

    field @Deprecated public static final String BROADCAST_NETWORK_PRIVILEGED = "android.permission.BROADCAST_NETWORK_PRIVILEGED";

    field @FlaggedApi("android.media.audio.concurrent_audio_record_bypass_permission") public static final String BYPASS_CONCURRENT_RECORD_AUDIO_RESTRICTION = "android.permission.BYPASS_CONCURRENT_RECORD_AUDIO_RESTRICTION";

    field public static final String BYPASS_ROLE_QUALIFICATION = "android.permission.BYPASS_ROLE_QUALIFICATION";

    field public static final String CALL_AUDIO_INTERCEPTION = "android.permission.CALL_AUDIO_INTERCEPTION";

    field public static final String CAMERA_DISABLE_TRANSMIT_LED = "android.permission.CAMERA_DISABLE_TRANSMIT_LED";

core/res/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ android_app { 
        "android.app.flags-aconfig",

        "android.appwidget.flags-aconfig",

        "android.content.pm.flags-aconfig",

        "android.media.audio-aconfig",

        "android.provider.flags-aconfig",

        "camera_platform_flags",

        "android.net.platform.flags-aconfig",

core/res/AndroidManifest.xml

+9 −0
Original line number Diff line number Diff line
@@ -6492,6 +6492,15 @@ 
    <permission android:name="android.permission.CAPTURE_VOICE_COMMUNICATION_OUTPUT"

        android:protectionLevel="signature|privileged|role" />



    <!-- @SystemApi Allows an application to bypass concurrency restrictions while

        recording audio. For example, apps with this permission can continue to record

        while a voice call is active.</p>

     @FlaggedApi(android.media.audio.Flags.FLAG_CONCURRENT_AUDIO_RECORD_BYPASS_PERMISSION)

     @hide -->

    <permission android:name="android.permission.BYPASS_CONCURRENT_RECORD_AUDIO_RESTRICTION"

        android:featureFlag="android.media.audio.concurrent_audio_record_bypass_permission"

        android:protectionLevel="signature|privileged|role" />



    <!-- @SystemApi Allows an application to capture audio for hotword detection.

         <p>Not for use by third-party applications.</p>

         @hide -->