Merge "Make the muteFromPrivacyToggle state transparent" into sc-dev

2021-03-19 15:46:21 +00:00
parent b61ef5342c 2b3880718d
commit 36cd5ef49b
1 changed files with 3 additions and 1 deletions
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -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() {