Merge "Fix AVR compatibility." am: 9e4df4985a am: babd85e24d

am: 4088527e0c Change-Id: Ib1088ec8aa9e3afdb05c46681ec8cb7bab74f790
2019-08-23 03:47:32 -07:00
parent 2476002005 4088527e0c
commit 77c749611d
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);
+            }
        }
    }