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

Commit fae55ecf authored by Evan Severson's avatar Evan Severson Committed by Automerger Merge Worker
Browse files

Merge "Make the muteFromPrivacyToggle state transparent" into sc-dev am: 36cd5ef4 

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

Change-Id: Ic9709892c18b5a9e571b4c92cbaffee63534610c
parents f15d6ab8 36cd5ef4

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

+3 −1
Original line number Diff line number Diff line
@@ -3871,7 +3871,9 @@ public class AudioService extends IAudioService.Stub 
     * @return true if microphone is reported as muted by primary HAL

     */

    public boolean isMicrophoneMuted() {

        return mMicMuteFromSystemCached && !mMicMuteFromPrivacyToggle;

        return mMicMuteFromSystemCached

                && (!mMicMuteFromPrivacyToggle

                        || mMicMuteFromApi || mMicMuteFromRestrictions || mMicMuteFromSwitch);

    }



    private boolean isMicrophoneSupposedToBeMuted() {