Merge "Fix AVR compatibility."

am: 9e4df4985a

Change-Id: I6d67424f99eb0a24e0b5dbc70c8ca62ba8ab6457

1 files changed, 5 insertions, 1 deletions

diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
index 8a7051f0e736..dacf372e4f93 100644
--- 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);
+            }
         }
     }