From b071084a3f768c9e56d9222cb6af62b9a43568de Mon Sep 17 00:00:00 2001
From: kholoud mohamed <kholoudm@google.com>
Date: Mon, 15 Mar 2021 16:46:58 +0000
Subject: [PATCH] Create new permission QUERY_AUDIO_STATE

Created a new permission to allow access to device audio
state and granted it to shell.

Test: N/A
Bug: 182260585
Merged-In: If1bfcb1341402717fec74cc704caa7e1eb18fa2e
Change-Id: If1bfcb1341402717fec74cc704caa7e1eb18fa2e
---
 core/api/test-current.txt          | 1 +
 core/res/AndroidManifest.xml       | 5 +++++
 packages/Shell/AndroidManifest.xml | 1 +
 3 files changed, 7 insertions(+)

diff --git a/core/api/test-current.txt b/core/api/test-current.txt
index 1762ebc7a3172..ed46c170828bf 100644
--- a/core/api/test-current.txt
+++ b/core/api/test-current.txt
@@ -21,6 +21,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";
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index cea5d90f2fe85..d8a6aedcd2f6a 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -4111,6 +4111,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>
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index 2662437c8f27a..e0fd4264bc9ae 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -184,6 +184,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" />