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

Commit a8f97ffd authored by Jean-Michel Trivi's avatar Jean-Michel Trivi
Browse files

AudioService: permission for volume adjustment to lowest values 

  Define an attenuation threshold under which the
MODIFY_AUDIO_SETTINGS permission is required to adjust volume.
  Verify permission at the interface of audio service, and
propagate this information so its used when getting a valid
index during a volume adjustment or set.
  Make the audio service dump display the min index when it
differs from the normal min index.
  Enforcement is only for STREAM_ALARM.

Bug: 137015603
Test: use POC app in bug, verify ALARM volume not at 1 with \
      adb shell dumpsys audio

Change-Id: I083a26fd8eeebd4e5434ed02a4a803cbb920ab84
parent a543dfde

media/java/android/media/AudioManagerInternal.java

+3 −3
Original line number Diff line number Diff line
@@ -29,13 +29,13 @@ import com.android.server.LocalServices; 
public abstract class AudioManagerInternal {



    public abstract void adjustSuggestedStreamVolumeForUid(int streamType, int direction,

            int flags, String callingPackage, int uid);

            int flags, String callingPackage, int uid, int pid);



    public abstract void adjustStreamVolumeForUid(int streamType, int direction, int flags,

            String callingPackage, int uid);

            String callingPackage, int uid, int pid);



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

            String callingPackage, int uid);

            String callingPackage, int uid, int pid);



    public abstract void setRingerModeDelegate(RingerModeDelegate delegate);

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

+138 −40

File changed.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/media/MediaSessionRecord.java

+7 −4
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR 
                public void run() {

                    try {

                        mAudioManagerInternal.setStreamVolumeForUid(stream, volumeValue, flags,

                                opPackageName, uid);

                                opPackageName, uid, pid);

                    } catch (IllegalArgumentException | SecurityException e) {

                        Log.e(TAG, "Cannot set volume: stream=" + stream + ", value=" + volumeValue

                                + ", flags=" + flags, e);
@@ -501,12 +501,15 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR 
        // Must use opPackageName for adjusting volumes with UID.

        final String opPackageName;

        final int uid;

        final int pid;

        if (asSystemService) {

            opPackageName = mContext.getOpPackageName();

            uid = Process.SYSTEM_UID;

            pid = Process.myPid();

        } else {

            opPackageName = callingOpPackageName;

            uid = callingUid;

            pid = callingPid;

        }

        mHandler.post(new Runnable() {

            @Override
@@ -515,15 +518,15 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR 
                    if (useSuggested) {

                        if (AudioSystem.isStreamActive(stream, 0)) {

                            mAudioManagerInternal.adjustSuggestedStreamVolumeForUid(stream,

                                    direction, flags, opPackageName, uid);

                                    direction, flags, opPackageName, uid, pid);

                        } else {

                            mAudioManagerInternal.adjustSuggestedStreamVolumeForUid(

                                    AudioManager.USE_DEFAULT_STREAM_TYPE, direction,

                                    flags | previousFlagPlaySound, opPackageName, uid);

                                    flags | previousFlagPlaySound, opPackageName, uid, pid);

                        }

                    } else {

                        mAudioManagerInternal.adjustStreamVolumeForUid(stream, direction, flags,

                                opPackageName, uid);

                                opPackageName, uid, pid);

                    }

                } catch (IllegalArgumentException | SecurityException e) {

                    Log.e(TAG, "Cannot adjust volume: direction=" + direction + ", stream="

services/core/java/com/android/server/media/MediaSessionService.java

+4 −1
Original line number Diff line number Diff line
@@ -2107,16 +2107,19 @@ public class MediaSessionService extends SystemService implements Monitor { 
                    public void run() {

                        final String callingOpPackageName;

                        final int callingUid;

                        final int callingPid;

                        if (asSystemService) {

                            callingOpPackageName = mContext.getOpPackageName();

                            callingUid = Process.myUid();

                            callingPid = Process.myPid();

                        } else {

                            callingOpPackageName = opPackageName;

                            callingUid = uid;

                            callingPid = pid;

                        }

                        try {

                            mAudioManagerInternal.adjustSuggestedStreamVolumeForUid(suggestedStream,

                                    direction, flags, callingOpPackageName, callingUid);

                                    direction, flags, callingOpPackageName, callingUid, callingPid);

                        } catch (SecurityException | IllegalArgumentException e) {

                            Log.e(TAG, "Cannot adjust volume: direction=" + direction

                                    + ", suggestedStream=" + suggestedStream + ", flags=" + flags