Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Jonathan Reichert
2023-02-14 12:07:37 +00:00
committed by Automerger Merge Worker
parent bbef2bcca7 3fdf8ccda1
commit 7149335749
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/audio/AudioService.java
View File

@@ -2387,10 +2387,6 @@ public class AudioService extends IAudioService.Stub
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 @@ public class AudioService extends IAudioService.Stub
/** @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) {