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

Commit 54980f32 authored by Kholoud Mohamed's avatar Kholoud Mohamed Committed by Automerger Merge Worker
Browse files

Merge "Create new permission QUERY_AUDIO_STATE" into sc-dev am: 797b8a9d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13877105

Change-Id: Ib123c838c7dc4e32ac5eeb75812ac7e8f8397d2d
parents 73f99770 797b8a9d

core/api/test-current.txt

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

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

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

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

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

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

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

core/res/AndroidManifest.xml

+5 −0
Original line number Diff line number Diff line
@@ -4365,6 +4365,11 @@ 
    <permission android:name="android.permission.MODIFY_AUDIO_ROUTING"

        android:protectionLevel="signature|privileged" />



    <!-- @TestApi Allows an application to query audio related state.

         @hide -->

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

                android:protectionLevel="signature" />



    <!-- Allows an application to modify what effects are applied to all audio

         (matching certain criteria) from any application.

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

packages/Shell/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ 
    <uses-permission android:name="android.permission.SET_HARMFUL_APP_WARNINGS" />

    <uses-permission android:name="android.permission.MANAGE_SENSORS" />

    <uses-permission android:name="android.permission.MANAGE_AUDIO_POLICY" />

    <uses-permission android:name="android.permission.QUERY_AUDIO_STATE" />

    <uses-permission android:name="android.permission.MANAGE_CAMERA" />

    <!-- Permissions needed to test system only camera devices -->

    <uses-permission android:name="android.permission.CAMERA" />