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

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

am 5e34b6b9: am 43b2746b: Merge "CEC: Let <Active Source> from the active... 

am 5e34b6b9: am 43b2746b: Merge "CEC: Let <Active Source> from the active source work" into lmp-mr1-dev
automerge: c8ece533

* commit 'c8ece533':
  CEC: Let <Active Source> from the active source work
parents b53d1a27 c8ece533

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

+0 −5
Original line number Diff line number Diff line
@@ -62,11 +62,6 @@ final class ActiveSourceHandler { 
    void process(ActiveSource newActive, int deviceType) {

        // Seq #17

        HdmiCecLocalDeviceTv tv = mSource;

        ActiveSource activeSource = tv.getActiveSource();

        if (activeSource.equals(newActive)) {

            invokeCallback(HdmiControlManager.RESULT_SUCCESS);

            return;

        }

        HdmiDeviceInfo device = mService.getDeviceInfo(newActive.logicalAddress);

        if (device == null) {

            tv.startNewDeviceAction(newActive, deviceType);