Add callback to startArcAction (55037ec5) · Commits · e / os / android_frameworks_base

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

+27 −11

Original line number	Diff line number	Diff line
		@@ -899,10 +899,16 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {

		@ServiceThreadOnly
		void startArcAction(boolean enabled) {
		startArcAction(enabled, null);
		}

		@ServiceThreadOnly
		void startArcAction(boolean enabled, IHdmiControlCallback callback) {
		assertRunOnServiceThread();
		HdmiDeviceInfo info = getAvrDeviceInfo();
		if (info == null) {
		Slog.w(TAG, "Failed to start arc action; No AVR device.");
		invokeCallback(callback, HdmiControlManager.RESULT_TARGET_NOT_AVAILABLE);
		return;
		}
		if (!canStartArcUpdateAction(info.getLogicalAddress(), enabled)) {
		@@ -910,25 +916,37 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
		if (enabled && !isConnectedToArcPort(info.getPhysicalAddress())) {
		displayOsd(OSD_MESSAGE_ARC_CONNECTED_INVALID_PORT);
		}
		invokeCallback(callback, HdmiControlManager.RESULT_INCORRECT_MODE);
		return;
		}
		if (enabled && mService.earcBlocksArcConnection()) {
		Slog.i(TAG,
		"ARC connection blocked because eARC connection is established or being "
		+ "established.");
		invokeCallback(callback, HdmiControlManager.RESULT_INCORRECT_MODE);
		return;
		}

		// Terminate opposite action and start action if not exist.
		// Terminate opposite action and create an action with callback.
		if (enabled) {
		removeAction(RequestArcTerminationAction.class);
		if (!hasAction(RequestArcInitiationAction.class)) {
		addAndStartAction(new RequestArcInitiationAction(this, info.getLogicalAddress()));
		if (hasAction(RequestArcInitiationAction.class)) {
		RequestArcInitiationAction existingInitiationAction =
		getActions(RequestArcInitiationAction.class).get(0);
		existingInitiationAction.addCallback(callback);
		} else {
		addAndStartAction(
		new RequestArcInitiationAction(this, info.getLogicalAddress(), callback));
		}
		} else {
		removeAction(RequestArcInitiationAction.class);
		if (!hasAction(RequestArcTerminationAction.class)) {
		addAndStartAction(new RequestArcTerminationAction(this, info.getLogicalAddress()));
		if (hasAction(RequestArcTerminationAction.class)) {
		RequestArcTerminationAction existingTerminationAction =
		getActions(RequestArcTerminationAction.class).get(0);
		existingTerminationAction.addCallback(callback);
		} else {
		addAndStartAction(
		new RequestArcTerminationAction(this, info.getLogicalAddress(), callback));
		}
		}
		}
		@@ -1036,9 +1054,8 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
		return Constants.ABORT_REFUSED;
		}

		// In case where <Initiate Arc> is started by <Request ARC Initiation>
		// need to clean up RequestArcInitiationAction.
		removeAction(RequestArcInitiationAction.class);
		// In case where <Initiate Arc> is started by <Request ARC Initiation>, this message is
		// handled in RequestArcInitiationAction as well.
		SetArcTransmissionStateAction action = new SetArcTransmissionStateAction(this,
		message.getSource(), true);
		addAndStartAction(action);
		@@ -1072,9 +1089,8 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
		return Constants.HANDLED;
		}
		// Do not check ARC configuration since the AVR might have been already removed.
		// Clean up RequestArcTerminationAction in case <Terminate Arc> was started by
		// <Request ARC Termination>.
		removeAction(RequestArcTerminationAction.class);
		// In case where <Terminate Arc> is started by <Request ARC Termination>, this
		// message is handled in RequestArcTerminationAction as well.
		SetArcTransmissionStateAction action = new SetArcTransmissionStateAction(this,
		message.getSource(), false);
		addAndStartAction(action);

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -3237,6 +3237,9 @@ public class HdmiControlService extends SystemService {
		}

		private void invokeCallback(IHdmiControlCallback callback, int result) {
		if (callback == null) {
		return;
		}
		try {
		callback.onComplete(result);
		} catch (RemoteException e) {

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

+8 −28

Original line number	Diff line number	Diff line
		@@ -16,7 +16,9 @@

		package com.android.server.hdmi;

		import android.hardware.hdmi.HdmiControlManager;
		import android.hardware.hdmi.HdmiDeviceInfo;
		import android.hardware.hdmi.IHdmiControlCallback;

		/**
		* Base feature action class for <Request ARC Initiation>/<Request ARC Termination>.
		@@ -35,41 +37,19 @@ abstract class RequestArcAction extends HdmiCecFeatureAction {
		*
		* @param source {@link HdmiCecLocalDevice} instance
		* @param avrAddress address of AV receiver. It should be AUDIO_SYSTEM type
		* @param callback callback to inform about the status of the action
		* @throws IllegalArgumentException if device type of sourceAddress and avrAddress
		* is invalid
		*/
		RequestArcAction(HdmiCecLocalDevice source, int avrAddress) {
		super(source);
		RequestArcAction(HdmiCecLocalDevice source, int avrAddress, IHdmiControlCallback callback) {
		super(source, callback);
		HdmiUtils.verifyAddressType(getSourceAddress(), HdmiDeviceInfo.DEVICE_TV);
		HdmiUtils.verifyAddressType(avrAddress, HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM);
		mAvrAddress = avrAddress;
		}

		@Override
		boolean processCommand(HdmiCecMessage cmd) {
		if (mState != STATE_WATING_FOR_REQUEST_ARC_REQUEST_RESPONSE
		\|\| !HdmiUtils.checkCommandSource(cmd, mAvrAddress, TAG)) {
		return false;
		}
		int opcode = cmd.getOpcode();
		switch (opcode) {
		// Handles only <Feature Abort> here and, both <Initiate ARC> and <Terminate ARC>
		// are handled in HdmiControlService itself because both can be
		// received without <Request ARC Initiation> or <Request ARC Termination>.
		case Constants.MESSAGE_FEATURE_ABORT:
		int originalOpcode = cmd.getParams()[0] & 0xFF;
		if (originalOpcode == Constants.MESSAGE_REQUEST_ARC_TERMINATION) {
		disableArcTransmission();
		finish();
		return true;
		} else if (originalOpcode == Constants.MESSAGE_REQUEST_ARC_INITIATION) {
		tv().disableArc();
		finish();
		return true;
		}
		return false;
		}
		return false;
		RequestArcAction(HdmiCecLocalDevice source, int avrAddress) {
		this(source, avrAddress, null);
		}

		protected final void disableArcTransmission() {
		@@ -86,6 +66,6 @@ abstract class RequestArcAction extends HdmiCecFeatureAction {
		}
		HdmiLogger.debug("[T] RequestArcAction.");
		disableArcTransmission();
		finish();
		finishWithCallback(HdmiControlManager.RESULT_TIMEOUT);
		}
		}

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

+37 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package com.android.server.hdmi;

		import android.hardware.hdmi.HdmiControlManager;
		import android.hardware.hdmi.IHdmiControlCallback;
		import android.hardware.tv.cec.V1_0.SendMessageResult;

		/**
		@@ -35,6 +37,16 @@ final class RequestArcInitiationAction extends RequestArcAction {
		super(source, avrAddress);
		}

		/**
		* @Constructor
		*
		* For more details look at {@link RequestArcAction#RequestArcAction}.
		*/
		RequestArcInitiationAction(HdmiCecLocalDevice source, int avrAddress,
		IHdmiControlCallback callback) {
		super(source, avrAddress, callback);
		}

		@Override
		boolean start() {
		// Seq #38
		@@ -49,10 +61,34 @@ final class RequestArcInitiationAction extends RequestArcAction {
		if (error != SendMessageResult.SUCCESS) {
		// Turn off ARC status if <Request ARC Initiation> fails.
		tv().disableArc();
		finish();
		finishWithCallback(HdmiControlManager.RESULT_TARGET_NOT_AVAILABLE);
		}
		}
		});
		return true;
		}

		@Override
		boolean processCommand(HdmiCecMessage cmd) {
		if (mState != STATE_WATING_FOR_REQUEST_ARC_REQUEST_RESPONSE
		\|\| !HdmiUtils.checkCommandSource(cmd, mAvrAddress, TAG)) {
		return false;
		}
		int opcode = cmd.getOpcode();
		switch (opcode) {
		case Constants.MESSAGE_FEATURE_ABORT:
		int originalOpcode = cmd.getParams()[0] & 0xFF;
		if (originalOpcode == Constants.MESSAGE_REQUEST_ARC_INITIATION) {
		tv().disableArc();
		finishWithCallback(HdmiControlManager.RESULT_TARGET_NOT_AVAILABLE);
		return true;
		}
		return false;
		case Constants.MESSAGE_INITIATE_ARC:
		finishWithCallback(HdmiControlManager.RESULT_SUCCESS);
		// This message still needs to be handled in HdmiCecLocalDeviceTv as well.
		return false;
		}
		return false;
		}
		}

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

+37 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package com.android.server.hdmi;

		import android.hardware.hdmi.HdmiControlManager;
		import android.hardware.hdmi.IHdmiControlCallback;
		import android.hardware.tv.cec.V1_0.SendMessageResult;

		/**
		@@ -35,6 +37,16 @@ final class RequestArcTerminationAction extends RequestArcAction {
		super(source, avrAddress);
		}

		/**
		* @Constructor
		*
		* @see RequestArcAction#RequestArcAction
		*/
		RequestArcTerminationAction(HdmiCecLocalDevice source, int avrAddress,
		IHdmiControlCallback callback) {
		super(source, avrAddress, callback);
		}

		@Override
		boolean start() {
		mState = STATE_WATING_FOR_REQUEST_ARC_REQUEST_RESPONSE;
		@@ -49,10 +61,34 @@ final class RequestArcTerminationAction extends RequestArcAction {
		// If failed to send <Request ARC Termination>, start "Disabled" ARC
		// transmission action.
		disableArcTransmission();
		finish();
		finishWithCallback(HdmiControlManager.RESULT_TARGET_NOT_AVAILABLE);
		}
		}
		});
		return true;
		}

		@Override
		boolean processCommand(HdmiCecMessage cmd) {
		if (mState != STATE_WATING_FOR_REQUEST_ARC_REQUEST_RESPONSE
		\|\| !HdmiUtils.checkCommandSource(cmd, mAvrAddress, TAG)) {
		return false;
		}
		int opcode = cmd.getOpcode();
		switch (opcode) {
		case Constants.MESSAGE_FEATURE_ABORT:
		int originalOpcode = cmd.getParams()[0] & 0xFF;
		if (originalOpcode == Constants.MESSAGE_REQUEST_ARC_TERMINATION) {
		disableArcTransmission();
		finishWithCallback(HdmiControlManager.RESULT_TARGET_NOT_AVAILABLE);
		return true;
		}
		return false;
		case Constants.MESSAGE_TERMINATE_ARC:
		finishWithCallback(HdmiControlManager.RESULT_SUCCESS);
		// This message still needs to be handled in HdmiCecLocalDeviceTv as well.
		return false;
		}
		return false;
		}
		}