diff options
| author | Michal Olech <molech@google.com> | 2020-12-15 13:53:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-12-15 13:53:33 +0000 |
| commit | fafb66fb86e78fa1a6f0ff8fe80922e129f101ed (patch) | |
| tree | 6d86999566e27058dab8a76c0145cc0da025b8d8 /core/java | |
| parent | aeef5c9cec23be8c441617f4ecfc07b5def2ebb9 (diff) | |
| parent | 989204e09bf9f89273d41e5b60d6785a539c6c0a (diff) | |
Merge "[CEC Configuration] Rename 1_4_b to 1_4_B"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/hardware/hdmi/HdmiControlManager.java | 4 | ||||
| -rw-r--r-- | core/java/android/hardware/hdmi/HdmiDeviceInfo.java | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/core/java/android/hardware/hdmi/HdmiControlManager.java b/core/java/android/hardware/hdmi/HdmiControlManager.java index ae10f4006ce5..3a73de6a87dd 100644 --- a/core/java/android/hardware/hdmi/HdmiControlManager.java +++ b/core/java/android/hardware/hdmi/HdmiControlManager.java @@ -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) diff --git a/core/java/android/hardware/hdmi/HdmiDeviceInfo.java b/core/java/android/hardware/hdmi/HdmiDeviceInfo.java index a8cafef844f1..c0b177d0efde 100644 --- a/core/java/android/hardware/hdmi/HdmiDeviceInfo.java +++ b/core/java/android/hardware/hdmi/HdmiDeviceInfo.java @@ -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"; |