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

Merge "CEC: Implement handleReportArcTermination method"

Browse Source
This commit is contained in:
Treehugger Robot
2021-04-13 14:24:27 +00:00
committed by Gerrit Code Review
parent fd7056c7c9 7fba133318
commit 9026f587b7
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,10 +49,7 @@ public class ArcTerminationActionFromAvr extends HdmiCecFeatureAction {
switch (cmd.getOpcode()) { switch (cmd.getOpcode()) {
case Constants.MESSAGE_REPORT_ARC_TERMINATED: case Constants.MESSAGE_REPORT_ARC_TERMINATED:
mState = STATE_ARC_TERMINATED; mState = STATE_ARC_TERMINATED;
audioSystem().setArcStatus(false); audioSystem().processArcTermination();
if (audioSystem().getLocalActivePort() == Constants.CEC_SWITCH_ARC) {
audioSystem().routeToInputFromPortId(audioSystem().getRoutingPort());
}
finish(); finish();
return true; return true;
} }

11
services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java
View File

@@ -570,8 +570,7 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource {
@ServiceThreadOnly @ServiceThreadOnly
protected boolean handleReportArcTermination(HdmiCecMessage message) { protected boolean handleReportArcTermination(HdmiCecMessage message) {
assertRunOnServiceThread(); assertRunOnServiceThread();
// TODO(amyjojo): implement report arc terminate handler processArcTermination();
HdmiLogger.debug(TAG + "Stub handleReportArcTermination");
return true; return true;
} }
@@ -916,6 +915,14 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource {
mArcEstablished = enabled; mArcEstablished = enabled;
} }
void processArcTermination() {
setArcStatus(false);
// Switch away from ARC input when ARC is terminated.
if (getLocalActivePort() == Constants.CEC_SWITCH_ARC) {
routeToInputFromPortId(getRoutingPort());
}
}
/** Switch hardware ARC circuit in the system. */ /** Switch hardware ARC circuit in the system. */
@ServiceThreadOnly @ServiceThreadOnly
private void enableAudioReturnChannel(boolean enabled) { private void enableAudioReturnChannel(boolean enabled) {