Merge "[CEC Configuration] Rename 1_4_b to 1_4_B" (fafb66fb) · Commits · e / os / android_frameworks_base

core/java/android/hardware/hdmi/HdmiControlManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -350,7 +350,7 @@ public final class HdmiControlManager {
		*
		* @hide
		*/
		public static final int HDMI_CEC_VERSION_1_4_b = 0x05;
		public static final int HDMI_CEC_VERSION_1_4_B = 0x05;
		/**
		* Version constant for HDMI-CEC v2.0.
		*
		@@ -361,7 +361,7 @@ public final class HdmiControlManager {
		* @hide
		*/
		@IntDef({
		HDMI_CEC_VERSION_1_4_b,
		HDMI_CEC_VERSION_1_4_B,
		HDMI_CEC_VERSION_2_0
		})
		@Retention(RetentionPolicy.SOURCE)

core/java/android/hardware/hdmi/HdmiDeviceInfo.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -203,7 +203,7 @@ public class HdmiDeviceInfo implements Parcelable {
		public HdmiDeviceInfo(int logicalAddress, int physicalAddress, int portId, int deviceType,
		int vendorId, String displayName, int powerStatus) {
		this(logicalAddress, physicalAddress, portId, deviceType,
		vendorId, displayName, powerStatus, HdmiControlManager.HDMI_CEC_VERSION_1_4_b);
		vendorId, displayName, powerStatus, HdmiControlManager.HDMI_CEC_VERSION_1_4_B);
		}

		/**
		@@ -221,7 +221,7 @@ public class HdmiDeviceInfo implements Parcelable {
		int vendorId, String displayName) {
		this(logicalAddress, physicalAddress, portId, deviceType,
		vendorId, displayName, HdmiControlManager.POWER_STATUS_UNKNOWN,
		HdmiControlManager.HDMI_CEC_VERSION_1_4_b);
		HdmiControlManager.HDMI_CEC_VERSION_1_4_B);
		}

		/**
		@@ -239,7 +239,7 @@ public class HdmiDeviceInfo implements Parcelable {
		mId = idForHardware(portId);
		mLogicalAddress = -1;
		mDeviceType = DEVICE_RESERVED;
		mHdmiCecVersion = HdmiControlManager.HDMI_CEC_VERSION_1_4_b;
		mHdmiCecVersion = HdmiControlManager.HDMI_CEC_VERSION_1_4_B;
		mVendorId = 0;
		mDevicePowerStatus = HdmiControlManager.POWER_STATUS_UNKNOWN;
		mDisplayName = "HDMI" + portId;
		@@ -265,7 +265,7 @@ public class HdmiDeviceInfo implements Parcelable {
		mId = idForMhlDevice(portId);
		mLogicalAddress = -1;
		mDeviceType = DEVICE_RESERVED;
		mHdmiCecVersion = HdmiControlManager.HDMI_CEC_VERSION_1_4_b;
		mHdmiCecVersion = HdmiControlManager.HDMI_CEC_VERSION_1_4_B;
		mVendorId = 0;
		mDevicePowerStatus = HdmiControlManager.POWER_STATUS_UNKNOWN;
		mDisplayName = "Mobile";
		@@ -287,7 +287,7 @@ public class HdmiDeviceInfo implements Parcelable {

		mLogicalAddress = -1;
		mDeviceType = DEVICE_INACTIVE;
		mHdmiCecVersion = HdmiControlManager.HDMI_CEC_VERSION_1_4_b;
		mHdmiCecVersion = HdmiControlManager.HDMI_CEC_VERSION_1_4_B;
		mPortId = PORT_INVALID;
		mDevicePowerStatus = HdmiControlManager.POWER_STATUS_UNKNOWN;
		mDisplayName = "Inactive";

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -79,7 +79,7 @@ public class HdmiCecControllerTest {
		}

		private HdmiCecController mHdmiCecController;
		private int mCecVersion = HdmiControlManager.HDMI_CEC_VERSION_1_4_b;
		private int mCecVersion = HdmiControlManager.HDMI_CEC_VERSION_1_4_B;
		private int mLogicalAddress = 16;
		private AllocateAddressCallback mCallback =
		new AllocateAddressCallback() {

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -284,7 +284,7 @@ public class HdmiCecLocalDeviceTest {
		public void handleCecVersion_isHandled() {
		boolean result = mHdmiLocalDevice.onMessage(
		HdmiCecMessageBuilder.buildCecVersion(ADDR_PLAYBACK_1, mHdmiLocalDevice.mAddress,
		HdmiControlManager.HDMI_CEC_VERSION_1_4_b));
		HdmiControlManager.HDMI_CEC_VERSION_1_4_B));

		assertThat(result).isTrue();
		}

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -104,7 +104,7 @@ public class HdmiCecMessageBuilderTest {
		@Test
		public void buildReportFeatures_basicTv_1_4() {
		HdmiCecMessage message = HdmiCecMessageBuilder.buildReportFeatures(ADDR_TV,
		HdmiControlManager.HDMI_CEC_VERSION_1_4_b,
		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());

		@@ -114,7 +114,7 @@ public class HdmiCecMessageBuilderTest {
		@Test
		public void buildReportFeatures_basicPlayback_1_4() {
		HdmiCecMessage message = HdmiCecMessageBuilder.buildReportFeatures(ADDR_PLAYBACK_1,
		HdmiControlManager.HDMI_CEC_VERSION_1_4_b,
		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());

		@@ -124,7 +124,7 @@ public class HdmiCecMessageBuilderTest {
		@Test
		public void buildReportFeatures_basicPlaybackAudioSystem_1_4() {
		HdmiCecMessage message = HdmiCecMessageBuilder.buildReportFeatures(ADDR_PLAYBACK_1,
		HdmiControlManager.HDMI_CEC_VERSION_1_4_b,
		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());