Merge "Fix AVR compatibility."

am: 9e4df4985a Change-Id: I6d67424f99eb0a24e0b5dbc70c8ca62ba8ab6457
2019-08-23 02:55:04 -07:00
parent 392130fee5 9e4df4985a
commit babd85e24d
1 changed files with 5 additions and 1 deletions
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
@@ -832,7 +832,11 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
                mService.setSystemAudioActivated(on);
                mService.announceSystemAudioModeChange(on);
            }
-            startArcAction(on);
+            if (on && !mArcEstablished) {
+                startArcAction(true);
+            } else if (!on) {
+                startArcAction(false);
+            }
        }
    }