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

Merge "HDMICEC: Deprecate HdmiTvClient#getDeviceList"

Browse Source
This commit is contained in:
TreeHugger Robot
2021-08-18 08:02:00 +00:00
committed by Android (Google) Code Review
parent 2f9639e0fd 35cc37299c
commit 427ad046c7
4 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/system-current.txt
View File

@@ -3640,7 +3640,7 @@ package android.hardware.hdmi {
public final class HdmiTvClient extends android.hardware.hdmi.HdmiClient {
method public void clearTimerRecording(int, int, android.hardware.hdmi.HdmiTimerRecordSources.TimerRecordSource);
method public void deviceSelect(int, @NonNull android.hardware.hdmi.HdmiTvClient.SelectCallback);
method public java.util.List<android.hardware.hdmi.HdmiDeviceInfo> getDeviceList();
method @Deprecated public java.util.List<android.hardware.hdmi.HdmiDeviceInfo> getDeviceList();
method public int getDeviceType();
method public void portSelect(int, @NonNull android.hardware.hdmi.HdmiTvClient.SelectCallback);
method public void sendMhlVendorCommand(int, int, int, byte[]);

2
core/java/android/hardware/hdmi/HdmiSwitchClient.java
View File

@@ -165,7 +165,9 @@ public class HdmiSwitchClient extends HdmiClient {
* there is none.
*
* @hide
* @deprecated Please use {@link HdmiControlManager#getConnectedDevices()} instead.
*/
@Deprecated
public List<HdmiDeviceInfo> getDeviceList() {
try {
return mService.getDeviceList();

2
core/java/android/hardware/hdmi/HdmiTvClient.java
View File

@@ -158,7 +158,9 @@ public final class HdmiTvClient extends HdmiClient {
*
* @return list of {@link HdmiDeviceInfo} for connected CEC devices.
* Empty list is returned if there is none.
* @deprecated Please use {@link HdmiControlManager#getConnectedDevices()} instead.
*/
@Deprecated
public List<HdmiDeviceInfo> getDeviceList() {
try {
return mService.getDeviceList();

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

@@ -542,4 +542,13 @@ public class HdmiCecNetworkTest {
assertThat(cecDeviceInfo.getLogicalAddress()).isEqualTo(logicalAddress);
assertThat(cecDeviceInfo.getCecVersion()).isEqualTo(cecVersion);
}
@Test
public void getSafeCecDevicesLocked_addDevice_sizeOne() {
HdmiDeviceInfo cecDeviceInfo = new HdmiDeviceInfo();
mHdmiCecNetwork.addCecDevice(cecDeviceInfo);
assertThat(mHdmiCecNetwork.getSafeCecDevicesLocked()).hasSize(1);
}
}