Merge "Fix AVR compatibility."

2019-08-22 19:59:21 +00:00
parent 2eb5d0c183 452541739d
commit 9e4df4985a
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
@@ -850,7 +850,11 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
                mSystemAudioActivated = on;
                mService.announceSystemAudioModeChange(on);
            }
-            startArcAction(on);
+            if (on && !mArcEstablished) {
+                startArcAction(true);
+            } else if (!on) {
+                startArcAction(false);
+            }
        }
    }