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

Commit 7fa00380 authored by Hayden Gomes's avatar Hayden Gomes
Browse files

Consolidating MODIFY_AUDIO_SETTINGS permission checks 

Adding hasModifyAudioSettings methods to consolidate check logic in
AudioService

Bug: 157665889
Test: atest AudioManagerTest
Change-Id: Iff444abe51702b882bd11ded32ced11311c065a8
parent 62c7e0bc

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

+18 −28
Original line number Diff line number Diff line
@@ -1908,11 +1908,8 @@ public class AudioService extends IAudioService.Stub 
    /** @see AudioManager#adjustVolume(int, int) */

    public void adjustSuggestedStreamVolume(int direction, int suggestedStreamType, int flags,

            String callingPackage, String caller) {

        boolean hasModifyAudioSettings =

                mContext.checkCallingPermission(Manifest.permission.MODIFY_AUDIO_SETTINGS)

                == PackageManager.PERMISSION_GRANTED;

        adjustSuggestedStreamVolume(direction, suggestedStreamType, flags, callingPackage,

                caller, Binder.getCallingUid(), hasModifyAudioSettings, VOL_ADJUST_NORMAL);

                caller, Binder.getCallingUid(), hasModifyAudioSettings(), VOL_ADJUST_NORMAL);

    }



    private void adjustSuggestedStreamVolume(int direction, int suggestedStreamType, int flags,
@@ -2017,13 +2014,10 @@ public class AudioService extends IAudioService.Stub 
                    + "CHANGE_ACCESSIBILITY_VOLUME / callingPackage=" + callingPackage);

            return;

        }

        final boolean hasModifyAudioSettings =

                mContext.checkCallingPermission(Manifest.permission.MODIFY_AUDIO_SETTINGS)

                        == PackageManager.PERMISSION_GRANTED;

        sVolumeLogger.log(new VolumeEvent(VolumeEvent.VOL_ADJUST_STREAM_VOL, streamType,

                direction/*val1*/, flags/*val2*/, callingPackage));

        adjustStreamVolume(streamType, direction, flags, callingPackage, callingPackage,

                Binder.getCallingUid(), hasModifyAudioSettings, VOL_ADJUST_NORMAL);

                Binder.getCallingUid(), hasModifyAudioSettings(), VOL_ADJUST_NORMAL);

    }



    protected void adjustStreamVolume(int streamType, int direction, int flags,
@@ -2534,13 +2528,10 @@ public class AudioService extends IAudioService.Stub 
                    + " MODIFY_AUDIO_ROUTING  callingPackage=" + callingPackage);

            return;

        }

        final boolean hasModifyAudioSettings =

                mContext.checkCallingOrSelfPermission(Manifest.permission.MODIFY_AUDIO_SETTINGS)

                        == PackageManager.PERMISSION_GRANTED;

        sVolumeLogger.log(new VolumeEvent(VolumeEvent.VOL_SET_STREAM_VOL, streamType,

                index/*val1*/, flags/*val2*/, callingPackage));

        setStreamVolume(streamType, index, flags, callingPackage, callingPackage,

                Binder.getCallingUid(), hasModifyAudioSettings);

                Binder.getCallingUid(), hasModifyAudioSettings());

    }



    private boolean canChangeAccessibilityVolume() {
@@ -3206,8 +3197,7 @@ public class AudioService extends IAudioService.Stub 
        ensureValidStreamType(streamType);

        final boolean isPrivileged =

                Binder.getCallingUid() == Process.SYSTEM_UID

                 || (mContext.checkCallingPermission(Manifest.permission.MODIFY_AUDIO_SETTINGS)

                        == PackageManager.PERMISSION_GRANTED)

                 || (hasModifyAudioSettings())

                 || (mContext.checkCallingPermission(Manifest.permission.MODIFY_AUDIO_ROUTING)

                        == PackageManager.PERMISSION_GRANTED);

        return (mStreamStates[streamType].getMinIndex(isPrivileged) + 5) / 10;
@@ -4765,9 +4755,18 @@ public class AudioService extends IAudioService.Stub 
        handler.sendMessageAtTime(handler.obtainMessage(msg, arg1, arg2, obj), time);

    }



    private boolean hasModifyAudioSettings() {

        return mContext.checkCallingPermission(Manifest.permission.MODIFY_AUDIO_SETTINGS)

                == PackageManager.PERMISSION_GRANTED;

    }



    private boolean hasModifyAudioSettings(int pid, int uid) {

        return mContext.checkPermission(Manifest.permission.MODIFY_AUDIO_SETTINGS, pid, uid)

                == PackageManager.PERMISSION_GRANTED;

    }



    boolean checkAudioSettingsPermission(String method) {

        if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.MODIFY_AUDIO_SETTINGS)

                == PackageManager.PERMISSION_GRANTED) {

        if (hasModifyAudioSettings()) {

            return true;

        }

        String msg = "Audio Settings Permission Denial: " + method + " from pid="
@@ -7697,13 +7696,10 @@ public class AudioService extends IAudioService.Stub 
        @Override

        public void adjustSuggestedStreamVolumeForUid(int streamType, int direction, int flags,

                String callingPackage, int uid, int pid) {

            final boolean hasModifyAudioSettings =

                    mContext.checkPermission(Manifest.permission.MODIFY_AUDIO_SETTINGS, pid, uid)

                    == PackageManager.PERMISSION_GRANTED;

            // direction and stream type swap here because the public

            // adjustSuggested has a different order than the other methods.

            adjustSuggestedStreamVolume(direction, streamType, flags, callingPackage,

                    callingPackage, uid, hasModifyAudioSettings, VOL_ADJUST_NORMAL);

                    callingPackage, uid, hasModifyAudioSettings(pid, uid), VOL_ADJUST_NORMAL);

        }



        @Override
@@ -7714,21 +7710,15 @@ public class AudioService extends IAudioService.Stub 
                        direction/*val1*/, flags/*val2*/, new StringBuilder(callingPackage)

                        .append(" uid:").append(uid).toString()));

            }

            final boolean hasModifyAudioSettings =

                    mContext.checkPermission(Manifest.permission.MODIFY_AUDIO_SETTINGS, pid, uid)

                            == PackageManager.PERMISSION_GRANTED;

            adjustStreamVolume(streamType, direction, flags, callingPackage,

                    callingPackage, uid, hasModifyAudioSettings, VOL_ADJUST_NORMAL);

                    callingPackage, uid, hasModifyAudioSettings(pid, uid), VOL_ADJUST_NORMAL);

        }



        @Override

        public void setStreamVolumeForUid(int streamType, int direction, int flags,

                String callingPackage, int uid, int pid) {

            final boolean hasModifyAudioSettings =

                    mContext.checkPermission(Manifest.permission.MODIFY_AUDIO_SETTINGS, pid, uid)

                            == PackageManager.PERMISSION_GRANTED;

            setStreamVolume(streamType, direction, flags, callingPackage, callingPackage, uid,

                    hasModifyAudioSettings);

                    hasModifyAudioSettings(pid, uid));

        }



        @Override