Merge "Fix AVR compatibility." am: 9e4df4985a

am: babd85e24d Change-Id: I01d0dd2fffc45c4b2e54990595fb922bff849dc1
2019-08-23 03:25:18 -07:00
parent ec2c5c2e18 babd85e24d
commit 4088527e0c
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);
+            }
        }
    }