Merge "Fix <Report Audio Status> update"

am: 1d5e2c3c37 Change-Id: Iac3e1fe3f93c376ccc35e29d611067fb0ad8a8fc
2018-01-18 23:59:12 +00:00
parent b88d9b4593 1d5e2c3c37
commit e7aaba48de
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;