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

Browse Source 
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>
This commit is contained in:
Jonathan Reichert
2023-02-14 11:20:45 +00:00
committed by Automerger Merge Worker
parent ef7d75e740 697fe662cc
commit 3fdf8ccda1
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

@@ -2369,10 +2369,6 @@ public class AudioService extends IAudioService.Stub
Log.w(TAG, "audioFormat to enable is not a surround format."); Log.w(TAG, "audioFormat to enable is not a surround format.");
return false; 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(); final long token = Binder.clearCallingIdentity();
try { try {
@@ -2440,11 +2436,6 @@ public class AudioService extends IAudioService.Stub
/** @see AudioManager#getEncodedSurroundMode() */ /** @see AudioManager#getEncodedSurroundMode() */
@Override @Override
public int getEncodedSurroundMode(int targetSdkVersion) { 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(); final long token = Binder.clearCallingIdentity();
try { try {
synchronized (mSettingsLock) { synchronized (mSettingsLock) {