Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 427ad046 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "HDMICEC: Deprecate HdmiTvClient#getDeviceList"

parents 2f9639e0 35cc3729

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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[]);

core/java/android/hardware/hdmi/HdmiSwitchClient.java

+2 −0
Original line number Diff line number Diff line
@@ -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();

core/java/android/hardware/hdmi/HdmiTvClient.java

+2 −0
Original line number Diff line number Diff line
@@ -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();

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

+9 −0
Original line number Diff line number Diff line
@@ -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);

    }

}