Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[CEC Configuration] Rename 1_4_b to 1_4_B

Browse Source 
SystemApi complains:
error: Constant field names must be named with only upper case characters:
`android.hardware.hdmi.HdmiControlManager#HDMI_CEC_VERSION_1_4_b`,
should be `HDMI__CEC__VERSION_1_4_B`

Bug: 174731501
Bug: 172637440
Test: atest com.google.android.gts.hdmicec.HdmiControlManagerHostTest
Change-Id: Ia1bfdb44e704c99fa574663f658a2173f6b48d21
This commit is contained in:
Michal Olech
2020-12-15 12:22:22 +01:00
parent 564058e5bf
commit 989204e09b
9 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/hardware/hdmi/HdmiControlManager.java
View File

@@ -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)

10
core/java/android/hardware/hdmi/HdmiDeviceInfo.java
View File

@@ -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";

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

@@ -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() {

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

@@ -271,7 +271,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();
}

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

@@ -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());

8
services/tests/servicestests/src/com/android/server/hdmi/HdmiCecNetworkTest.java
View File

@@ -390,7 +390,7 @@ public class HdmiCecNetworkTest {
assertThat(cecDeviceInfo.getLogicalAddress()).isEqualTo(logicalAddress);
assertThat(cecDeviceInfo.getDevicePowerStatus()).isEqualTo(updatedPowerStatus);
assertThat(cecDeviceInfo.getCecVersion()).isEqualTo(
HdmiControlManager.HDMI_CEC_VERSION_1_4_b);
HdmiControlManager.HDMI_CEC_VERSION_1_4_B);
}
@Test
@@ -436,7 +436,7 @@ public class HdmiCecNetworkTest {
assertThat(cecDeviceInfo.getDevicePowerStatus()).isEqualTo(
HdmiControlManager.POWER_STATUS_UNKNOWN);
assertThat(cecDeviceInfo.getCecVersion()).isEqualTo(
HdmiControlManager.HDMI_CEC_VERSION_1_4_b);
HdmiControlManager.HDMI_CEC_VERSION_1_4_B);
}
@Test
@@ -482,7 +482,7 @@ public class HdmiCecNetworkTest {
@Test
public void cecDevices_tracking_reportCecVersion_tracksCecVersion_cec14() {
int logicalAddress = Constants.ADDR_PLAYBACK_1;
int cecVersion = HdmiControlManager.HDMI_CEC_VERSION_1_4_b;
int cecVersion = HdmiControlManager.HDMI_CEC_VERSION_1_4_B;
mHdmiCecNetwork.handleCecMessage(
HdmiCecMessageBuilder.buildCecVersion(logicalAddress, Constants.ADDR_BROADCAST,
cecVersion));
@@ -512,7 +512,7 @@ public class HdmiCecNetworkTest {
@Test
public void cecDevices_tracking_reportFeatures_tracksCecVersion_cec14() {
int logicalAddress = Constants.ADDR_PLAYBACK_1;
int cecVersion = HdmiControlManager.HDMI_CEC_VERSION_1_4_b;
int cecVersion = HdmiControlManager.HDMI_CEC_VERSION_1_4_B;
mHdmiCecNetwork.handleCecMessage(
HdmiCecMessageBuilder.buildReportFeatures(logicalAddress,
cecVersion, Collections.emptyList(),

2
services/tests/servicestests/src/com/android/server/hdmi/HdmiCecPowerStatusControllerTest.java
View File

@@ -62,7 +62,7 @@ public class HdmiCecPowerStatusControllerTest {
private FakeNativeWrapper mNativeWrapper;
private TestLooper mTestLooper = new TestLooper();
private ArrayList<HdmiCecLocalDevice> mLocalDevices = new ArrayList<>();
private int mHdmiCecVersion = HdmiControlManager.HDMI_CEC_VERSION_1_4_b;
private int mHdmiCecVersion = HdmiControlManager.HDMI_CEC_VERSION_1_4_B;
@Mock
private IPowerManager mIPowerManagerMock;
@Mock

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

@@ -246,7 +246,7 @@ public class HdmiControlServiceTest {
public void initialPowerStatus_normalBoot_goToStandby_doesNotBroadcastsPowerStatus_1_4() {
mHdmiControlService.getHdmiCecConfig().setIntValue(
HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_VERSION,
HdmiControlManager.HDMI_CEC_VERSION_1_4_b);
HdmiControlManager.HDMI_CEC_VERSION_1_4_B);
mHdmiControlService.setControlEnabled(true);
mNativeWrapper.clearResultMessages();
@@ -442,17 +442,17 @@ public class HdmiControlServiceTest {
null);
mHdmiControlService.setControlEnabled(true);
assertThat(mHdmiControlService.getCecVersion()).isEqualTo(
HdmiControlManager.HDMI_CEC_VERSION_1_4_b);
HdmiControlManager.HDMI_CEC_VERSION_1_4_B);
}
@Test
public void getCecVersion_1_4() {
mHdmiControlService.getHdmiCecConfig().setIntValue(
HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_VERSION,
HdmiControlManager.HDMI_CEC_VERSION_1_4_b);
HdmiControlManager.HDMI_CEC_VERSION_1_4_B);
mHdmiControlService.setControlEnabled(true);
assertThat(mHdmiControlService.getCecVersion()).isEqualTo(
HdmiControlManager.HDMI_CEC_VERSION_1_4_b);
HdmiControlManager.HDMI_CEC_VERSION_1_4_B);
}
@Test
@@ -469,10 +469,10 @@ public class HdmiControlServiceTest {
public void getCecVersion_change() {
mHdmiControlService.getHdmiCecConfig().setIntValue(
HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_VERSION,
HdmiControlManager.HDMI_CEC_VERSION_1_4_b);
HdmiControlManager.HDMI_CEC_VERSION_1_4_B);
mHdmiControlService.setControlEnabled(true);
assertThat(mHdmiControlService.getCecVersion()).isEqualTo(
HdmiControlManager.HDMI_CEC_VERSION_1_4_b);
HdmiControlManager.HDMI_CEC_VERSION_1_4_B);
mHdmiControlService.getHdmiCecConfig().setIntValue(
HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_VERSION,
@@ -486,7 +486,7 @@ public class HdmiControlServiceTest {
public void handleGiveFeatures_cec14_featureAbort() {
mHdmiControlService.getHdmiCecConfig().setIntValue(
HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_VERSION,
HdmiControlManager.HDMI_CEC_VERSION_1_4_b);
HdmiControlManager.HDMI_CEC_VERSION_1_4_B);
mHdmiControlService.setControlEnabled(true);
mTestLooper.dispatchAll();
@@ -526,7 +526,7 @@ public class HdmiControlServiceTest {
mNativeWrapper.clearResultMessages();
mHdmiControlService.getHdmiCecConfig().setIntValue(
HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_VERSION,
HdmiControlManager.HDMI_CEC_VERSION_1_4_b);
HdmiControlManager.HDMI_CEC_VERSION_1_4_B);
mHdmiControlService.setControlEnabled(true);
mHdmiControlService.allocateLogicalAddress(mLocalDevices, INITIATED_BY_ENABLE_CEC);
mTestLooper.dispatchAll();

30
services/tests/servicestests/src/com/android/server/hdmi/HdmiUtilsTest.java
View File

@@ -536,49 +536,49 @@ public class HdmiUtilsTest {
@Test
public void isEligibleAddressForCecVersion_1_4() {
assertThat(HdmiUtils.isEligibleAddressForCecVersion(
HdmiControlManager.HDMI_CEC_VERSION_1_4_b,
HdmiControlManager.HDMI_CEC_VERSION_1_4_B,
Constants.ADDR_TV)).isTrue();
assertThat(HdmiUtils.isEligibleAddressForCecVersion(
HdmiControlManager.HDMI_CEC_VERSION_1_4_b,
HdmiControlManager.HDMI_CEC_VERSION_1_4_B,
Constants.ADDR_RECORDER_1)).isTrue();
assertThat(HdmiUtils.isEligibleAddressForCecVersion(
HdmiControlManager.HDMI_CEC_VERSION_1_4_b,
HdmiControlManager.HDMI_CEC_VERSION_1_4_B,
Constants.ADDR_RECORDER_2)).isTrue();
assertThat(HdmiUtils.isEligibleAddressForCecVersion(
HdmiControlManager.HDMI_CEC_VERSION_1_4_b,
HdmiControlManager.HDMI_CEC_VERSION_1_4_B,
Constants.ADDR_TUNER_1)).isTrue();
assertThat(HdmiUtils.isEligibleAddressForCecVersion(
HdmiControlManager.HDMI_CEC_VERSION_1_4_b,
HdmiControlManager.HDMI_CEC_VERSION_1_4_B,
Constants.ADDR_PLAYBACK_1)).isTrue();
assertThat(HdmiUtils.isEligibleAddressForCecVersion(
HdmiControlManager.HDMI_CEC_VERSION_1_4_b,
HdmiControlManager.HDMI_CEC_VERSION_1_4_B,
Constants.ADDR_AUDIO_SYSTEM)).isTrue();
assertThat(HdmiUtils.isEligibleAddressForCecVersion(
HdmiControlManager.HDMI_CEC_VERSION_1_4_b,
HdmiControlManager.HDMI_CEC_VERSION_1_4_B,
Constants.ADDR_TUNER_2)).isTrue();
assertThat(HdmiUtils.isEligibleAddressForCecVersion(
HdmiControlManager.HDMI_CEC_VERSION_1_4_b,
HdmiControlManager.HDMI_CEC_VERSION_1_4_B,
Constants.ADDR_TUNER_3)).isTrue();
assertThat(HdmiUtils.isEligibleAddressForCecVersion(
HdmiControlManager.HDMI_CEC_VERSION_1_4_b,
HdmiControlManager.HDMI_CEC_VERSION_1_4_B,
Constants.ADDR_PLAYBACK_2)).isTrue();
assertThat(HdmiUtils.isEligibleAddressForCecVersion(
HdmiControlManager.HDMI_CEC_VERSION_1_4_b,
HdmiControlManager.HDMI_CEC_VERSION_1_4_B,
Constants.ADDR_RECORDER_3)).isTrue();
assertThat(HdmiUtils.isEligibleAddressForCecVersion(
HdmiControlManager.HDMI_CEC_VERSION_1_4_b,
HdmiControlManager.HDMI_CEC_VERSION_1_4_B,
Constants.ADDR_TUNER_4)).isTrue();
assertThat(HdmiUtils.isEligibleAddressForCecVersion(
HdmiControlManager.HDMI_CEC_VERSION_1_4_b,
HdmiControlManager.HDMI_CEC_VERSION_1_4_B,
Constants.ADDR_PLAYBACK_3)).isTrue();
assertThat(HdmiUtils.isEligibleAddressForCecVersion(
HdmiControlManager.HDMI_CEC_VERSION_1_4_b,
HdmiControlManager.HDMI_CEC_VERSION_1_4_B,
Constants.ADDR_BACKUP_1)).isFalse();
assertThat(HdmiUtils.isEligibleAddressForCecVersion(
HdmiControlManager.HDMI_CEC_VERSION_1_4_b,
HdmiControlManager.HDMI_CEC_VERSION_1_4_B,
Constants.ADDR_BACKUP_2)).isFalse();
assertThat(HdmiUtils.isEligibleAddressForCecVersion(
HdmiControlManager.HDMI_CEC_VERSION_1_4_b,
HdmiControlManager.HDMI_CEC_VERSION_1_4_B,
Constants.ADDR_SPECIFIC_USE)).isTrue();
}