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

Commit e184a6b9 authored by Jinsuk Kim's avatar Jinsuk Kim Committed by Android (Google) Code Review
Browse files

Merge "CEC: Reset active source/path before going into standby" into mnc-dev

parents 41fe5292 7cc51c63

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

+3 −0
Original line number Diff line number Diff line
@@ -486,6 +486,7 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
            HdmiLogger.debug("Input not ready for device: %X; buffering the command", info.getId());

            mDelayedMessageBuffer.add(message);

        } else {

            updateDevicePowerStatus(logicalAddress, HdmiControlManager.POWER_STATUS_ON);

            ActiveSource activeSource = ActiveSource.of(logicalAddress, physicalAddress);

            ActiveSourceHandler.create(this, null).process(activeSource, info.getDeviceType());

        }
@@ -1613,6 +1614,8 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 


        super.disableDevice(initiatedByCec, callback);

        clearDeviceInfoList();

        getActiveSource().invalidate();

        setActivePath(Constants.INVALID_PHYSICAL_ADDRESS);

        checkIfPendingActionsCleared();

    }