Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "CEC: Send <Give System Audio Mode> regardless of TV's setting." into lmp-mr1-dev

Browse Source
This commit is contained in:
Jungshik Jang
2014-11-10 00:54:30 +00:00
committed by Android (Google) Code Review
parent e5a6f82139 7fb8e7f4ff
commit 324b1f8a47
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
View File

@@ -706,9 +706,7 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
@ServiceThreadOnly @ServiceThreadOnly
void onNewAvrAdded(HdmiDeviceInfo avr) { void onNewAvrAdded(HdmiDeviceInfo avr) {
assertRunOnServiceThread(); assertRunOnServiceThread();
if (getSystemAudioModeSetting()) { addAndStartAction(new SystemAudioAutoInitiationAction(this, avr.getLogicalAddress()));
addAndStartAction(new SystemAudioAutoInitiationAction(this, avr.getLogicalAddress()));
}
if (isArcFeatureEnabled()) { if (isArcFeatureEnabled()) {
startArcAction(true); startArcAction(true);
} }

21
services/core/java/com/android/server/hdmi/SystemAudioAutoInitiationAction.java
View File

@@ -71,19 +71,16 @@ final class SystemAudioAutoInitiationAction extends HdmiCecFeatureAction {
} }
private void handleSystemAudioModeStatusMessage() { private void handleSystemAudioModeStatusMessage() {
// If the last setting is system audio, turn on system audio whatever AVR status is. if (!canChangeSystemAudio()) {
if (tv().getSystemAudioModeSetting()) { HdmiLogger.debug("Cannot change system audio mode in auto initiation action.");
if (canChangeSystemAudio()) { finish();
addAndStartAction(new SystemAudioActionFromTv(tv(), mAvrAddress, true, null)); return;
}
} else {
// If the last setting is non-system audio, turn off system audio mode
// and update system audio status (volume or mute).
tv().setSystemAudioMode(false, true);
if (canChangeSystemAudio()) {
addAndStartAction(new SystemAudioStatusAction(tv(), mAvrAddress, null));
}
} }
boolean systemAudioModeSetting = tv().getSystemAudioModeSetting();
// Update AVR's system audio mode regardless of AVR's status.
addAndStartAction(new SystemAudioActionFromTv(tv(), mAvrAddress, systemAudioModeSetting,
null));
finish(); finish();
} }