Merge "Fix cyclic mute" into lmp-dev

2014-09-15 12:36:24 +00:00
parent 0a91a0ae7c 720407ad06
commit f5194d8cef
1 changed files with 6 additions and 0 deletions
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
@@ -889,6 +889,12 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
    void changeMute(boolean mute) {
        assertRunOnServiceThread();
        HdmiLogger.debug("[A]:Change mute:%b", mute);
+        synchronized (mLock) {
+            if (mSystemAudioMute == mute) {
+                HdmiLogger.debug("No need to change mute.");
+                return;
+            }
+        }
        if (!isSystemAudioActivated()) {
            HdmiLogger.debug("[A]:System audio is not activated.");
            return;