Merge "Remove duplicated cec keycode definitions." (65f7c3ff) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -165,9 +165,9 @@ final class DeviceSelectAction extends FeatureAction {

		private void turnOnDevice() {
		sendUserControlPressedAndReleased(mTarget.getLogicalAddress(),
		HdmiConstants.UI_COMMAND_POWER);
		HdmiCecKeycode.CEC_KEYCODE_POWER);
		sendUserControlPressedAndReleased(mTarget.getLogicalAddress(),
		HdmiConstants.UI_COMMAND_POWER_ON_FUNCTION);
		HdmiCecKeycode.CEC_KEYCODE_POWER_ON_FUNCTION);
		mState = STATE_WAIT_FOR_DEVICE_POWER_ON;
		addTimer(mState, TIMEOUT_POWER_ON_MS);
		}

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

+6 −8

Original line number	Diff line number	Diff line
		@@ -302,8 +302,6 @@ abstract class HdmiCecLocalDevice {
		@ServiceThreadOnly
		protected boolean handleUserControlPressed(HdmiCecMessage message) {
		assertRunOnServiceThread();
		final int opCode = message.getOpcode();
		final byte[] params = message.getParams();
		if (mService.isPowerOnOrTransient() && isPowerOffOrToggleCommand(message)) {
		mService.standby();
		return true;
		@@ -317,17 +315,17 @@ abstract class HdmiCecLocalDevice {
		private static boolean isPowerOnOrToggleCommand(HdmiCecMessage message) {
		byte[] params = message.getParams();
		return message.getOpcode() == HdmiCec.MESSAGE_USER_CONTROL_PRESSED && params.length == 1
		&& (params[0] == HdmiConstants.UI_COMMAND_POWER
		\|\| params[0] == HdmiConstants.UI_COMMAND_POWER_ON_FUNCTION
		\|\| params[0] == HdmiConstants.UI_COMMAND_POWER_TOGGLE_FUNCTION);
		&& (params[0] == HdmiCecKeycode.CEC_KEYCODE_POWER
		\|\| params[0] == HdmiCecKeycode.CEC_KEYCODE_POWER_ON_FUNCTION
		\|\| params[0] == HdmiCecKeycode.CEC_KEYCODE_POWER_TOGGLE_FUNCTION);
		}

		private static boolean isPowerOffOrToggleCommand(HdmiCecMessage message) {
		byte[] params = message.getParams();
		return message.getOpcode() == HdmiCec.MESSAGE_USER_CONTROL_PRESSED && params.length == 1
		&& (params[0] == HdmiConstants.UI_COMMAND_POWER
		\|\| params[0] == HdmiConstants.UI_COMMAND_POWER_OFF_FUNCTION
		\|\| params[0] == HdmiConstants.UI_COMMAND_POWER_TOGGLE_FUNCTION);
		&& (params[0] == HdmiCecKeycode.CEC_KEYCODE_POWER
		\|\| params[0] == HdmiCecKeycode.CEC_KEYCODE_POWER_OFF_FUNCTION
		\|\| params[0] == HdmiCecKeycode.CEC_KEYCODE_POWER_TOGGLE_FUNCTION);
		}

		protected boolean handleTextViewOn(HdmiCecMessage message) {

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

+0 −12

Original line number	Diff line number	Diff line
		@@ -37,18 +37,6 @@ final class HdmiConstants {
		static final int SYSTEM_AUDIO_STATUS_OFF = 0;
		static final int SYSTEM_AUDIO_STATUS_ON = 1;

		// Constants related to UI Command Codes.
		// Refer to CEC Table 30 in HDMI Spec v1.4b.
		static final int UI_COMMAND_POWER = 0x40;
		static final int UI_COMMAND_VOLUME_UP = 0x41;
		static final int UI_COMMAND_VOLUME_DOWN = 0x42;
		static final int UI_COMMAND_MUTE = 0x43;
		static final int UI_COMMAND_MUTE_FUNCTION = 0x65;
		static final int UI_COMMAND_RESTORE_VOLUME_FUNCTION = 0x66;
		static final int UI_COMMAND_POWER_TOGGLE_FUNCTION = 0x6B;
		static final int UI_COMMAND_POWER_OFF_FUNCTION = 0x6C;
		static final int UI_COMMAND_POWER_ON_FUNCTION = 0x6D;

		// Bit mask used to get the routing path of the top level device.
		// When &'d with the path 1.2.2.0 (0x1220), for instance, gives 1.0.0.0.
		static final int ROUTING_PATH_TOP_MASK = 0xF000;

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ import java.util.List;
		* If system audio is on, check hot-plug for audio system every 5 secs.
		* For other devices, keep 15 secs period.
		*/
		// #Seq 3
		// Seq #3
		final class HotplugDetectionAction extends FeatureAction {
		private static final String TAG = "HotPlugDetectionAction";

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -70,8 +70,8 @@ final class SystemAudioStatusAction extends FeatureAction {
		tv().setAudioStatus(false, HdmiConstants.UNKNOWN_VOLUME);

		int uiCommand = tv().getSystemAudioMode()
		? HdmiConstants.UI_COMMAND_RESTORE_VOLUME_FUNCTION // SystemAudioMode: ON
		: HdmiConstants.UI_COMMAND_MUTE_FUNCTION; // SystemAudioMode: OFF
		? HdmiCecKeycode.CEC_KEYCODE_RESTORE_VOLUME_FUNCTION // SystemAudioMode: ON
		: HdmiCecKeycode.CEC_KEYCODE_MUTE_FUNCTION; // SystemAudioMode: OFF
		sendUserControlPressedAndReleased(mAvrAddress, uiCommand);

		// Still return SUCCESS to callback.
		@@ -102,7 +102,7 @@ final class SystemAudioStatusAction extends FeatureAction {

		if ((tv().getSystemAudioMode() && mute) \|\| (!tv().getSystemAudioMode() && !mute)) {
		// Toggle AVR's mute status to match with the system audio status.
		sendUserControlPressedAndReleased(mAvrAddress, HdmiConstants.UI_COMMAND_MUTE);
		sendUserControlPressedAndReleased(mAvrAddress, HdmiCecKeycode.CEC_KEYCODE_MUTE);
		}
		finishWithCallback(HdmiCec.RESULT_SUCCESS);
		} else {