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

Commit e7d2f5c4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix <Routing Change> doesn't send on first switch." am: 15559f1d am:... 

Merge "Fix <Routing Change> doesn't send on first switch." am: 15559f1d am: 4ea9d05e am: 3d2b4b8e am: 9b4edee1 am: 655bbafb am: 087b567d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2583818



Change-Id: I9221c20c8b8f5f2b90c389fa1bb8749241fe6097
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e813b644 087b567d

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

+1 −0
Original line number Diff line number Diff line
@@ -377,6 +377,7 @@ public final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
            return;

        }

        int oldPath = getActivePortId() != Constants.INVALID_PORT_ID

                && getActivePortId() != Constants.CEC_SWITCH_HOME

                ? mService.portIdToPath(getActivePortId()) : getDeviceInfo().getPhysicalAddress();

        setActivePath(oldPath);

        if (mSkipRoutingControl) {