Merge "Use SystemAudioStatusAction in SystemAudioAction." (7eca94c1) · Commits · e / os / android_frameworks_base

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

+9 −61

Original line number	Diff line number	Diff line
		@@ -28,9 +28,6 @@ abstract class SystemAudioAction extends FeatureAction {
		// State in which waits for <SetSystemAudioMode>.
		private static final int STATE_WAIT_FOR_SET_SYSTEM_AUDIO_MODE = 1;

		// State in which waits for <ReportAudioStatus>.
		private static final int STATE_WAIT_FOR_REPORT_AUDIO_STATUS = 2;

		private static final int MAX_SEND_RETRY_COUNT = 2;

		private static final int ON_TIMEOUT_MS = 5000;
		@@ -92,39 +89,6 @@ abstract class SystemAudioAction extends FeatureAction {
		tv().setSystemAudioMode(mode);
		}

		protected void sendGiveAudioStatus() {
		HdmiCecMessage command = HdmiCecMessageBuilder.buildGiveAudioStatus(getSourceAddress(),
		mAvrLogicalAddress);
		sendCommand(command, new HdmiControlService.SendMessageCallback() {
		@Override
		public void onSendCompleted(int error) {
		if (error == HdmiConstants.SEND_RESULT_SUCCESS) {
		mState = STATE_WAIT_FOR_REPORT_AUDIO_STATUS;
		addTimer(mState, TIMEOUT_MS);
		} else {
		handleSendGiveAudioStatusFailure();
		}
		}
		});
		}

		private void handleSendGiveAudioStatusFailure() {
		// TODO: Notify the failure status.

		int uiCommand = tv().getSystemAudioMode()
		? HdmiConstants.UI_COMMAND_RESTORE_VOLUME_FUNCTION // SystemAudioMode: ON
		: HdmiConstants.UI_COMMAND_MUTE_FUNCTION; // SystemAudioMode: OFF
		sendUserControlPressedAndReleased(uiCommand);
		finish();
		}

		private void sendUserControlPressedAndReleased(int uiCommand) {
		sendCommand(HdmiCecMessageBuilder.buildUserControlPressed(
		getSourceAddress(), mAvrLogicalAddress, uiCommand));
		sendCommand(HdmiCecMessageBuilder.buildUserControlReleased(
		getSourceAddress(), mAvrLogicalAddress));
		}

		@Override
		final boolean processCommand(HdmiCecMessage cmd) {
		switch (mState) {
		@@ -137,7 +101,8 @@ abstract class SystemAudioAction extends FeatureAction {
		boolean receivedStatus = HdmiUtils.parseCommandParamSystemAudioStatus(cmd);
		if (receivedStatus == mTargetAudioStatus) {
		setSystemAudioMode(receivedStatus);
		sendGiveAudioStatus();
		startAudioStatusAction();
		return true;
		} else {
		// Unexpected response, consider the request is newly initiated by AVR.
		// To return 'false' will initiate new SystemAudioActionFromAvr by the control
		@@ -145,28 +110,14 @@ abstract class SystemAudioAction extends FeatureAction {
		finish();
		return false;
		}
		return true;

		case STATE_WAIT_FOR_REPORT_AUDIO_STATUS:
		// TODO: Handle <FeatureAbort> of <GiveAudioStatus>
		if (cmd.getOpcode() != HdmiCec.MESSAGE_REPORT_AUDIO_STATUS
		\|\| !HdmiUtils.checkCommandSource(cmd, mAvrLogicalAddress, TAG)) {
		default:
		return false;
		}
		byte[] params = cmd.getParams();
		if (params.length > 0) {
		boolean mute = (params[0] & 0x80) == 0x80;
		int volume = params[0] & 0x7F;
		tv().setAudioStatus(mute, volume);
		if (mTargetAudioStatus && mute \|\| !mTargetAudioStatus && !mute) {
		// Toggle AVR's mute status to match with the system audio status.
		sendUserControlPressedAndReleased(HdmiConstants.UI_COMMAND_MUTE);
		}
		}

		protected void startAudioStatusAction() {
		addAndStartAction(new SystemAudioStatusAction(tv(), mAvrLogicalAddress));
		finish();
		return true;
		}
		return false;
		}

		protected void removeSystemAudioActionInProgress() {
		@@ -183,9 +134,6 @@ abstract class SystemAudioAction extends FeatureAction {
		case STATE_WAIT_FOR_SET_SYSTEM_AUDIO_MODE:
		handleSendSystemAudioModeRequestTimeout();
		return;
		case STATE_WAIT_FOR_REPORT_AUDIO_STATUS:
		handleSendGiveAudioStatusFailure();
		return;
		}
		}
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -59,7 +59,7 @@ final class SystemAudioActionFromAvr extends SystemAudioAction {
		// TODO: Stop the action for System Audio Mode initialization if it is running.
		if (mTargetAudioStatus) {
		setSystemAudioMode(true);
		sendGiveAudioStatus();
		startAudioStatusAction();
		} else {
		setSystemAudioMode(false);
		finish();

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ import com.android.server.hdmi.HdmiControlService.SendMessageCallback;
		/**
		* Action to update audio status (volume or mute) of audio amplifier
		*/
		// TODO: refactor SystemAudioMode so that it uses this class instead of internal state.
		final class SystemAudioStatusAction extends FeatureAction {
		private static final String TAG = "SystemAudioStatusAction";