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

Commit 8c3f3cc8 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Automerger Merge Worker
Browse files

Merge "AudioService: fix CTS verifier for stream mute" into tm-qpr-dev am:... 

Merge "AudioService: fix CTS verifier for stream mute" into tm-qpr-dev am: de0b2d6a am: f9ae5a40

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



Change-Id: Ief2f363267011432423b755d8c368b778d81aa64
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents df0556e6 f9ae5a40

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

+4 −2
Original line number Diff line number Diff line
@@ -3717,9 +3717,11 @@ public class AudioService extends IAudioService.Stub 
            setRingerMode(getNewRingerMode(stream, index, flags),

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

        }

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

        // 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) {

        if ((streamType != AudioSystem.STREAM_BLUETOOTH_SCO)

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

            mStreamStates[stream].mute(index == 0);

        }

    }