diff options
| author | Wally Yau <wyau@google.com> | 2015-04-03 15:12:52 -0700 |
|---|---|---|
| committer | Wally Yau <wyau@google.com> | 2015-04-06 12:27:34 +0000 |
| commit | 951e3e42f5943d90b74d9feb9fbc224afa59ed31 (patch) | |
| tree | bdc34450f756f69542d677fa0fcc5f701905fcea /services/core/java/com/android/server/hdmi | |
| parent | 91a2eaf5ee4a4310f50bfc26b2d6e15a1f93d5eb (diff) | |
| download | frameworks_base-951e3e42f5943d90b74d9feb9fbc224afa59ed31.zip frameworks_base-951e3e42f5943d90b74d9feb9fbc224afa59ed31.tar.gz frameworks_base-951e3e42f5943d90b74d9feb9fbc224afa59ed31.tar.bz2 | |
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)
Diffstat (limited to 'services/core/java/com/android/server/hdmi')
| -rw-r--r-- | services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java | 6 |
1 files 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 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 @@ 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 |