commit 7149335749e68e08d54e9cb38c51ebf88c7ab25d
author Jonathan Reichert <jareichert@google.com> Tue Feb 14 12:07:37 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 14 12:07:37 2023 +0000
tree a5ef9ff33636ee8907ece88c5c230155223c7ba4
parent bbef2bcca707c0bab37376df1a33649bcf5d5840
parent 3fdf8ccda1520b051837ca2fcb2a8d4067a04b3d

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

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

Change-Id: Ic9729351a4788a247f6919662ad5fb9a22890cc4
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 a318a1e..53c13d8 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -2387,10 +2387,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 {
@@ -2458,11 +2454,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) {