Merge "Fix <Report Audio Status> update" am: 1d5e2c3c37

am: e7aaba48de Change-Id: I6f7314a01386aff883992d7f4b32bb9bb0500555
2018-01-19 00:05:48 +00:00
parent 0f279d4577 e7aaba48de
commit 4775f0c76e
1 changed files with 3 additions and 0 deletions
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
@@ -1003,6 +1003,9 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
    }

    void setAudioStatus(boolean mute, int volume) {
+        if (!isSystemAudioActivated()) {
+            return;
+        }
        synchronized (mLock) {
            mSystemAudioMute = mute;
            mSystemAudioVolume = volume;