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

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

Merge "CEC: Update CEC device info properly" into lmp-mr1-dev

parents b9f245d4 6102bac7

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

+6 −2
Original line number Diff line number Diff line
@@ -1324,12 +1324,16 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
    @ServiceThreadOnly

    final void addCecDevice(HdmiDeviceInfo info) {

        assertRunOnServiceThread();

        addDeviceInfo(info);

        HdmiDeviceInfo old = addDeviceInfo(info);

        if (info.getLogicalAddress() == mAddress) {

            // The addition of TV device itself should not be notified.

            return;

        }

        if (old == null) {

            invokeDeviceEventListener(info, HdmiControlManager.DEVICE_EVENT_ADD_DEVICE);

        } else if (!old.equals(info)) {

            invokeDeviceEventListener(info, HdmiControlManager.DEVICE_EVENT_UPDATE_DEVICE);

        }

    }



    /**