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

Commit c9854044 authored by Jinsuk Kim's avatar Jinsuk Kim Committed by android-build-merger
Browse files

am e96f9dd1: am b0b4921b: Merge "CEC: Make deviceSelect work for MHL device" into lmp-mr1-dev 

automerge: 30a061ed

* commit '30a061ed':
  CEC: Make deviceSelect work for MHL device
parents ffe26c21 30a061ed

services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java

+6 −2
Original line number Diff line number Diff line
@@ -326,8 +326,12 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
            ActiveSource activeSource = getActiveSource();

            HdmiDeviceInfo info = getCecDeviceInfo(activeSource.logicalAddress);

            if (info == null) {

                info = new HdmiDeviceInfo(Constants.ADDR_INVALID, path, getActivePortId(),

                        HdmiDeviceInfo.DEVICE_RESERVED, 0, null);

                info = mService.getDeviceInfoByPort(getActivePortId());

                if (info == null) {

                    // No CEC/MHL device is present at the port. Attempt to switch to

                    // the hardware port itself for non-CEC devices that may be connected.

                    info = new HdmiDeviceInfo(path, getActivePortId());

                }

            }

            mService.invokeInputChangeListener(info);

        }

services/core/java/com/android/server/hdmi/HdmiControlService.java

+10 −0
Original line number Diff line number Diff line
@@ -672,6 +672,16 @@ public final class HdmiControlService extends SystemService { 
        return tv() == null ? null : tv().getCecDeviceInfo(logicalAddress);

    }



    @ServiceThreadOnly

    HdmiDeviceInfo getDeviceInfoByPort(int port) {

        assertRunOnServiceThread();

        HdmiMhlLocalDeviceStub info = mMhlController.getLocalDevice(port);

        if (info != null) {

            return info.getInfo();

        }

        return null;

    }



    /**

     * Returns version of CEC.

     */