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

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

Merge "Fix TV doesn't send <Active Source> on boot up" am: 826dbaf5 

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



Change-Id: I0d78af0585e53b5de057b21d879a2e40b5f5a7f2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 41dba62f 826dbaf5

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

+2 −1
Original line number Diff line number Diff line
@@ -1232,7 +1232,8 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
    void launchRoutingControl(boolean routingForBootup) {

        assertRunOnServiceThread();

        // Seq #24

        if (getActivePortId() != Constants.INVALID_PORT_ID) {

        if (getActivePortId() != Constants.INVALID_PORT_ID

                && getActivePortId() != Constants.CEC_SWITCH_HOME) {

            if (!routingForBootup && !isProhibitMode()) {

                int newPath = mService.portIdToPath(getActivePortId());

                setActivePath(newPath);