From 951e3e42f5943d90b74d9feb9fbc224afa59ed31 Mon Sep 17 00:00:00 2001 From: Wally Yau Date: Fri, 3 Apr 2015 15:12:52 -0700 Subject: [PATCH] Reset system audio mode on startup rather than on stop. Bug fixed - When TV was turned off and AVR was on, audio was routed back to TV momentarily before the TV turned off. b/19791264 Change-Id: Iad639b6ba151b6615a7f4ce49fddfa4fc485e16c (cherry picked from commit b0efbf3898e80181210103f6ac535af69d3abb2d) --- .../java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java index 43f74fc849f5a..4ac2b48e377a8 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 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { HdmiDeviceInfo avr = getAvrDeviceInfo(); if (avr != null) { onNewAvrAdded(avr); + } else { + setSystemAudioMode(false, true); } } }); @@ -1615,10 +1617,6 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 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