Merge "Reset system audio mode on startup rather than on stop."
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
index 43f74fc..4ac2b48 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
@@ -785,6 +785,8 @@
HdmiDeviceInfo avr = getAvrDeviceInfo();
if (avr != null) {
onNewAvrAdded(avr);
+ } else {
+ setSystemAudioMode(false, true);
}
}
});
@@ -1615,10 +1617,6 @@
removeAction(SystemAudioAutoInitiationAction.class);
removeAction(SystemAudioStatusAction.class);
removeAction(VolumeControlAction.class);
-
- // Turn off the mode but do not write it the settings, so that the next time TV powers on
- // the system audio mode setting can be restored automatically.
- setSystemAudioMode(false, false);
}
@ServiceThreadOnly