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

am: 4775f0c76e Change-Id: I98074b58c0b9def3d766c40ac2c5bc669a2abd0f
2018-01-19 05:21:12 +00:00
parent 52f5d01ee8 4775f0c76e
commit 2ae76a73ac
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;