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"

Browse Source
This commit is contained in:
Jonathan Reichert
2023-02-14 10:01:30 +00:00
committed by Gerrit Code Review
parent 92bfdc6bd7 0d11f067c1
commit 697fe662cc
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

@@ -2329,10 +2329,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 {
@@ -2400,11 +2396,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) {