Merge "Remove HDMI CEC version constants" (a0ae51c7) · Commits · e / os / android_frameworks_base

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

+0 −9

Original line number	Diff line number	Diff line
		@@ -501,15 +501,6 @@ final class Constants {
		static final int DISABLED = 0;
		static final int ENABLED = 1;

		@IntDef({
		VERSION_1_4,
		VERSION_2_0
		})
		@interface CecVersion {}
		static final int VERSION_1_3 = 0x04;
		static final int VERSION_1_4 = 0x05;
		static final int VERSION_2_0 = 0x06;

		static final int ALL_DEVICE_TYPES_TV = 7;
		static final int ALL_DEVICE_TYPES_RECORDER = 6;
		static final int ALL_DEVICE_TYPES_TUNER = 5;

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.server.hdmi;

		import android.annotation.CallSuper;
		import android.annotation.Nullable;
		import android.hardware.hdmi.HdmiControlManager;
		import android.hardware.hdmi.HdmiDeviceInfo;
		import android.hardware.hdmi.IHdmiControlCallback;
		import android.hardware.input.InputManager;
		@@ -560,7 +561,7 @@ abstract class HdmiCecLocalDevice {
		protected abstract List<Integer> getDeviceFeatures();

		protected boolean handleGiveFeatures(HdmiCecMessage message) {
		if (mService.getCecVersion() < Constants.VERSION_2_0) {
		if (mService.getCecVersion() < HdmiControlManager.HDMI_CEC_VERSION_2_0) {
		return false;
		}

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -16,10 +16,10 @@

		package com.android.server.hdmi;

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

		import com.android.server.hdmi.Constants.AudioCodec;
		import com.android.server.hdmi.Constants.CecVersion;

		import java.io.UnsupportedEncodingException;
		import java.util.Arrays;
		@@ -696,9 +696,9 @@ public class HdmiCecMessageBuilder {
		return buildCommand(src, dest, Constants.MESSAGE_GIVE_FEATURES);
		}

		static HdmiCecMessage buildReportFeatures(int src, @CecVersion int cecVersion,
		List<Integer> allDeviceTypes, int rcProfile, List<Integer> rcFeatures,
		List<Integer> deviceFeatures) {
		static HdmiCecMessage buildReportFeatures(int src,
		@HdmiControlManager.HdmiCecVersion int cecVersion, List<Integer> allDeviceTypes,
		int rcProfile, List<Integer> rcFeatures, List<Integer> deviceFeatures) {
		byte cecVersionByte = (byte) (cecVersion & 0xFF);
		byte deviceTypes = 0;
		for (Integer deviceType : allDeviceTypes) {

services/tests/servicestests/src/com/android/server/hdmi/HdmiCecMessageBuilderTest.java

+9 −8

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import static com.android.server.hdmi.HdmiUtils.buildMessage;

		import static com.google.common.truth.Truth.assertThat;

		import android.hardware.hdmi.HdmiControlManager;
		import android.hardware.hdmi.HdmiDeviceInfo;
		import android.platform.test.annotations.Presubmit;

		@@ -103,7 +104,7 @@ public class HdmiCecMessageBuilderTest {
		@Test
		public void buildReportFeatures_basicTv_1_4() {
		HdmiCecMessage message = HdmiCecMessageBuilder.buildReportFeatures(ADDR_TV,
		Constants.VERSION_1_4,
		HdmiControlManager.HDMI_CEC_VERSION_1_4_b,
		Lists.newArrayList(HdmiDeviceInfo.DEVICE_TV), Constants.RC_PROFILE_TV,
		Lists.newArrayList(Constants.RC_PROFILE_TV_NONE), Collections.emptyList());

		@@ -113,7 +114,7 @@ public class HdmiCecMessageBuilderTest {
		@Test
		public void buildReportFeatures_basicPlayback_1_4() {
		HdmiCecMessage message = HdmiCecMessageBuilder.buildReportFeatures(ADDR_PLAYBACK_1,
		Constants.VERSION_1_4,
		HdmiControlManager.HDMI_CEC_VERSION_1_4_b,
		Lists.newArrayList(HdmiDeviceInfo.DEVICE_PLAYBACK), Constants.RC_PROFILE_TV,
		Lists.newArrayList(Constants.RC_PROFILE_TV_NONE), Collections.emptyList());

		@@ -123,7 +124,7 @@ public class HdmiCecMessageBuilderTest {
		@Test
		public void buildReportFeatures_basicPlaybackAudioSystem_1_4() {
		HdmiCecMessage message = HdmiCecMessageBuilder.buildReportFeatures(ADDR_PLAYBACK_1,
		Constants.VERSION_1_4,
		HdmiControlManager.HDMI_CEC_VERSION_1_4_b,
		Lists.newArrayList(HdmiDeviceInfo.DEVICE_PLAYBACK,
		HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM), Constants.RC_PROFILE_TV,
		Lists.newArrayList(Constants.RC_PROFILE_TV_NONE), Collections.emptyList());
		@@ -134,7 +135,7 @@ public class HdmiCecMessageBuilderTest {
		@Test
		public void buildReportFeatures_basicTv_2_0() {
		HdmiCecMessage message = HdmiCecMessageBuilder.buildReportFeatures(ADDR_TV,
		Constants.VERSION_2_0,
		HdmiControlManager.HDMI_CEC_VERSION_2_0,
		Lists.newArrayList(HdmiDeviceInfo.DEVICE_TV), Constants.RC_PROFILE_TV,
		Lists.newArrayList(Constants.RC_PROFILE_TV_NONE), Collections.emptyList());

		@@ -144,7 +145,7 @@ public class HdmiCecMessageBuilderTest {
		@Test
		public void buildReportFeatures_remoteControlTv_2_0() {
		HdmiCecMessage message = HdmiCecMessageBuilder.buildReportFeatures(ADDR_TV,
		Constants.VERSION_2_0,
		HdmiControlManager.HDMI_CEC_VERSION_2_0,
		Lists.newArrayList(HdmiDeviceInfo.DEVICE_TV), Constants.RC_PROFILE_TV,
		Lists.newArrayList(Constants.RC_PROFILE_TV_ONE), Collections.emptyList());

		@@ -154,7 +155,7 @@ public class HdmiCecMessageBuilderTest {
		@Test
		public void buildReportFeatures_remoteControlPlayback_2_0() {
		HdmiCecMessage message = HdmiCecMessageBuilder.buildReportFeatures(ADDR_TV,
		Constants.VERSION_2_0,
		HdmiControlManager.HDMI_CEC_VERSION_2_0,
		Lists.newArrayList(HdmiDeviceInfo.DEVICE_PLAYBACK), Constants.RC_PROFILE_SOURCE,
		Lists.newArrayList(Constants.RC_PROFILE_SOURCE_HANDLES_TOP_MENU,
		Constants.RC_PROFILE_SOURCE_HANDLES_SETUP_MENU), Collections.emptyList());
		@@ -165,7 +166,7 @@ public class HdmiCecMessageBuilderTest {
		@Test
		public void buildReportFeatures_deviceFeaturesTv_2_0() {
		HdmiCecMessage message = HdmiCecMessageBuilder.buildReportFeatures(ADDR_TV,
		Constants.VERSION_2_0,
		HdmiControlManager.HDMI_CEC_VERSION_2_0,
		Lists.newArrayList(HdmiDeviceInfo.DEVICE_TV), Constants.RC_PROFILE_TV,
		Lists.newArrayList(Constants.RC_PROFILE_TV_NONE),
		Lists.newArrayList(Constants.DEVICE_FEATURE_TV_SUPPORTS_RECORD_TV_SCREEN));
		@@ -176,7 +177,7 @@ public class HdmiCecMessageBuilderTest {
		@Test
		public void buildReportFeatures_deviceFeaturesPlayback_2_0() {
		HdmiCecMessage message = HdmiCecMessageBuilder.buildReportFeatures(ADDR_TV,
		Constants.VERSION_2_0,
		HdmiControlManager.HDMI_CEC_VERSION_2_0,
		Lists.newArrayList(HdmiDeviceInfo.DEVICE_PLAYBACK), Constants.RC_PROFILE_SOURCE,
		Lists.newArrayList(Constants.RC_PROFILE_SOURCE_HANDLES_TOP_MENU,
		Constants.RC_PROFILE_SOURCE_HANDLES_SETUP_MENU),

services/tests/servicestests/src/com/android/server/hdmi/HdmiControlServiceTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -470,7 +470,7 @@ public class HdmiControlServiceTest {
		mTestLooper.dispatchAll();

		HdmiCecMessage reportFeatures = HdmiCecMessageBuilder.buildReportFeatures(
		Constants.ADDR_PLAYBACK_1, Constants.VERSION_2_0,
		Constants.ADDR_PLAYBACK_1, HdmiControlManager.HDMI_CEC_VERSION_2_0,
		Arrays.asList(DEVICE_PLAYBACK, DEVICE_AUDIO_SYSTEM),
		mMyPlaybackDevice.getRcProfile(), mMyPlaybackDevice.getRcFeatures(),
		mMyPlaybackDevice.getDeviceFeatures());