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

Commit d2fe4b9e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "AudioService: setDeviceVolume shouln't change the mute state" into tm-qpr-dev

parents 49a61e54 193f5629

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

+19 −6
Original line number Diff line number Diff line
@@ -3637,8 +3637,19 @@ public class AudioService extends IAudioService.Stub 
        return false;

    }













    /**













     * Update stream volume, ringer mode and mute status after a volume index change













     * @param streamType













     * @param index













     * @param flags













     * @param device the device for which the volume is changed













     * @param caller













     * @param hasModifyAudioSettings













     * @param canChangeMute true if the origin of this event is one where the mute state should be













     *                      updated following the change in volume index













     */















    private void onSetStreamVolume(int streamType, int index, int flags, int device,













            String caller, boolean hasModifyAudioSettings) {













            String caller, boolean hasModifyAudioSettings, boolean canChangeMute) {















        final int stream = mStreamVolumeAlias[streamType];















        setStreamVolumeInt(stream, index, device, false, caller, hasModifyAudioSettings);















        // setting volume on ui sounds stream type also controls silent mode









@@ -3648,10 +3659,8 @@ public class AudioService extends IAudioService.Stub













                    TAG + ".onSetStreamVolume", false /*external*/);















        }















        // setting non-zero volume for a muted stream unmutes the stream and vice versa













        // (only when changing volume for the current device),















        // except for BT SCO stream where only explicit mute is allowed to comply to BT requirements













        if ((streamType != AudioSystem.STREAM_BLUETOOTH_SCO)













                && (getDeviceForStream(stream) == device)) {













        if ((streamType != AudioSystem.STREAM_BLUETOOTH_SCO) && canChangeMute) {















            // As adjustStreamVolume with muteAdjust flags mute/unmutes stream and aliased streams.















            muteAliasStreams(stream, index == 0);















        }










@@ -4366,7 +4375,10 @@ public class AudioService extends IAudioService.Stub













                mPendingVolumeCommand = new StreamVolumeCommand(















                                                    streamType, index, flags, device);















            } else {













                onSetStreamVolume(streamType, index, flags, device, caller, hasModifyAudioSettings);













                onSetStreamVolume(streamType, index, flags, device, caller, hasModifyAudioSettings,













                        // ada is non-null when called from setDeviceVolume,













                        // which shouldn't update the mute state













                        ada == null /*canChangeMute*/);















                index = mStreamStates[streamType].getIndex(device);















            }















        }










@@ -10275,7 +10287,8 @@ public class AudioService extends IAudioService.Stub













                                  mPendingVolumeCommand.mIndex,















                                  mPendingVolumeCommand.mFlags,















                                  mPendingVolumeCommand.mDevice,













                                  callingPackage, true /*hasModifyAudioSettings*/);













                                  callingPackage, true /*hasModifyAudioSettings*/,













                                  true /*canChangeMute*/);















                mPendingVolumeCommand = null;















            }















        }