commit 3d44f684ab1c5a00dc5923d6d68b06beb44b6649
author Jonathan Reichert <jareichert@google.com> Tue Feb 14 13:07:05 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 14 13:07:05 2023 +0000
tree 0586a3fcf056607765a0e4b6f110d982a162a4d8
parent 9b5c525970f0332dd64286aabbf0bf3d38b885f1
parent 7149335749e68e08d54e9cb38c51ebf88c7ab25d

Merge "Remove WRITE_SETTINGS permission check from AudioManager getter APIs" am: 697fe662cc am: 3fdf8ccda1 am: 7149335749

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

Change-Id: Id55db2664676313fc178a07f37af3f0ad8878497
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index e55bddb..e48c538 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -2402,10 +2402,6 @@
             Log.w(TAG, "audioFormat to enable is not a surround format.");
             return false;
         }
-        if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.WRITE_SETTINGS)
-                != PackageManager.PERMISSION_GRANTED) {
-            throw new SecurityException("Missing WRITE_SETTINGS permission");
-        }
 
         final long token = Binder.clearCallingIdentity();
         try {
@@ -2473,11 +2469,6 @@
     /** @see AudioManager#getEncodedSurroundMode() */
     @Override
     public int getEncodedSurroundMode(int targetSdkVersion) {
-        if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.WRITE_SETTINGS)
-                != PackageManager.PERMISSION_GRANTED) {
-            throw new SecurityException("Missing WRITE_SETTINGS permission");
-        }
-
         final long token = Binder.clearCallingIdentity();
         try {
             synchronized (mSettingsLock) {