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

Commit d88b39e9 authored by Paul Colta's avatar Paul Colta Committed by Gerrit Code Review
Browse files

Merge "cec: TV could fail to handle one touch play [1/1]" into main

parents 63933094 caba2c45

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

+2 −0
Original line number Diff line number Diff line
@@ -249,6 +249,7 @@ public final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
                .setDisplayName(HdmiUtils.getDefaultDeviceName(source))

                .setDeviceType(deviceTypes.get(0))

                .setVendorId(Constants.VENDOR_ID_UNKNOWN)

                .setPortId(mService.getHdmiCecNetwork().physicalAddressToPortId(physicalAddress))

                .build();

        mService.getHdmiCecNetwork().addCecDevice(newDevice);

    }
@@ -1398,6 +1399,7 @@ public final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
    protected void disableDevice(boolean initiatedByCec, PendingActionClearedCallback callback) {

        assertRunOnServiceThread();

        mService.unregisterTvInputCallback(mTvInputCallback);

        mTvInputs.clear();

        // Remove any repeated working actions.

        // HotplugDetectionAction will be reinstated during the wake up process.

        // HdmiControlService.onWakeUp() -> initializeLocalDevices() ->