Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71493357 authored by Jonathan Reichert's avatar Jonathan Reichert Committed by Automerger Merge Worker
Browse files

Merge "Remove WRITE_SETTINGS permission check from AudioManager getter APIs"... 

Merge "Remove WRITE_SETTINGS permission check from AudioManager getter APIs" am: 697fe662 am: 3fdf8ccd

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



Change-Id: Ic9729351a4788a247f6919662ad5fb9a22890cc4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bbef2bcc 3fdf8ccd

services/core/java/com/android/server/audio/AudioService.java

+0 −9
Original line number Diff line number Diff line
@@ -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) {