commit 3fdf8ccda1520b051837ca2fcb2a8d4067a04b3d
author Jonathan Reichert <jareichert@google.com> Tue Feb 14 11:20:45 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 14 11:20:45 2023 +0000
tree 517d93e9be704f45b621054f16a3daba0c26d201
parent ef7d75e7401677fe22922d0be290d52f054e8395
parent 697fe662cceee1a4f255bbb21403ee7a6740a6cc

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

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

Change-Id: I53d983e425560d86d44c962703fe6f7bb5a2f1d1
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 5275b7c..b666646 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -2369,10 +2369,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 {
@@ -2440,11 +2436,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) {