Merge "CEC: Implement handleReportArcTermination method" (9026f587) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/hdmi/ArcTerminationActionFromAvr.java

+1 −4

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

+9 −2

Original line number	Diff line number	Diff line
		@@ -570,8 +570,7 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource {
		@ServiceThreadOnly
		protected boolean handleReportArcTermination(HdmiCecMessage message) {
		assertRunOnServiceThread();
		// TODO(amyjojo): implement report arc terminate handler
		HdmiLogger.debug(TAG + "Stub handleReportArcTermination");
		processArcTermination();
		return true;
		}

		@@ -916,6 +915,14 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource {
		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. */
		@ServiceThreadOnly
		private void enableAudioReturnChannel(boolean enabled) {