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

Merge "Fix TV didn't initiate ARC sometimes." am: 89e7e85f06 am: 14abda59dd

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

Change-Id: Ibe9fc55fce436b99f73aff9232bc2036bb26f178
This commit is contained in:
Treehugger Robot
2020-12-01 19:31:29 +00:00
committed by Automerger Merge Worker
parent aa7d6d0e52 14abda59dd
commit 6a4f7c695c
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1569,10 +1569,11 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
// When the device is not unplugged but reawaken from standby, we check if the System // When the device is not unplugged but reawaken from standby, we check if the System
// Audio Control Feature is enabled or not then decide if turning SAM on/off accordingly. // Audio Control Feature is enabled or not then decide if turning SAM on/off accordingly.
if (getAvrDeviceInfo() != null && portId == getAvrDeviceInfo().getPortId()) { if (getAvrDeviceInfo() != null && portId == getAvrDeviceInfo().getPortId()) {
HdmiLogger.debug("Port ID:%d, 5v=%b", portId, connected);
if (!connected) { if (!connected) {
setSystemAudioMode(false); setSystemAudioMode(false);
} else if (mSystemAudioControlFeatureEnabled != mService.isSystemAudioActivated()){ } else {
setSystemAudioMode(mSystemAudioControlFeatureEnabled); onNewAvrAdded(getAvrDeviceInfo());
} }
} }

6
services/core/java/com/android/server/hdmi/SetArcTransmissionStateAction.java
View File

@@ -102,12 +102,12 @@ final class SetArcTransmissionStateAction extends HdmiCecFeatureAction {
} }
private void setArcStatus(boolean enabled) { private void setArcStatus(boolean enabled) {
boolean wasEnabled = tv().setArcStatus(enabled); tv().setArcStatus(enabled);
Slog.i(TAG, "Change arc status [old:" + wasEnabled + ", new:" + enabled + "]"); Slog.i(TAG, "Change arc status to " + enabled);
// If enabled before and set to "disabled" and send <Report Arc Terminated> to // If enabled before and set to "disabled" and send <Report Arc Terminated> to
// av reciever. // av reciever.
if (!enabled && wasEnabled) { if (!enabled) {
sendCommand(HdmiCecMessageBuilder.buildReportArcTerminated(getSourceAddress(), sendCommand(HdmiCecMessageBuilder.buildReportArcTerminated(getSourceAddress(),
mAvrAddress)); mAvrAddress));
} }