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

Merge "Set SAM according to TV's settings" am: db3769c465 am: 31444d7845 am: f8d2ecebb8

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1310537

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4d0247a8bb96a721888c0d41d750bf79bfd5b09b
This commit is contained in:
Treehugger Robot
2021-03-05 13:51:43 +00:00
committed by Automerger Merge Worker
parent 0f8bab9ea4 f8d2ecebb8
commit 55978fbc04
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1073,7 +1073,21 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
// Ignore this message.
return true;
}
setSystemAudioMode(HdmiUtils.parseCommandParamSystemAudioStatus(message));
boolean tvSystemAudioMode = isSystemAudioControlFeatureEnabled();
boolean avrSystemAudioMode = HdmiUtils.parseCommandParamSystemAudioStatus(message);
// Set System Audio Mode according to TV's settings.
// Handle <System Audio Mode Status> here only when
// SystemAudioAutoInitiationAction timeout
HdmiDeviceInfo avr = getAvrDeviceInfo();
if (avr == null) {
setSystemAudioMode(false);
} else if (avrSystemAudioMode != tvSystemAudioMode) {
addAndStartAction(new SystemAudioActionFromTv(this, avr.getLogicalAddress(),
tvSystemAudioMode, null));
} else {
setSystemAudioMode(tvSystemAudioMode);
}
return true;
}