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

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

Merge "Do not get portInfo if physical address is 0x0000" am: d2ac8db6 am:... 

Merge "Do not get portInfo if physical address is 0x0000" am: d2ac8db6 am: 54bf578a am: 909485e8

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



Change-Id: I3f5d451ad6e643033697fa040ef132d96d214a1f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d583a9c9 909485e8

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

+1 −1
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ public class HdmiCecNetwork { 
     */

    boolean isConnectedToArcPort(int physicalAddress) {

        int portId = physicalAddressToPortId(physicalAddress);

        if (portId != Constants.INVALID_PORT_ID) {

        if (portId != Constants.INVALID_PORT_ID && portId != Constants.CEC_SWITCH_HOME) {

            return mPortInfoMap.get(portId).isArcSupported();

        }

        return false;