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

Commit e67b37ff authored by Hongguang Chen's avatar Hongguang Chen Committed by Android (Google) Code Review
Browse files

Merge "Do not treat HDMI_RELATIVE_POSITION_UNKNOWN as a HDMI switch" into main

parents 5c733030 6185cc12

media/java/android/media/tv/TvInputInfo.java

+4 −3
Original line number Diff line number Diff line
@@ -939,9 +939,10 @@ public final class TvInputInfo implements Parcelable { 
                type = TYPE_HDMI;

                isHardwareInput = true;

                hdmiConnectionRelativePosition = getRelativePosition(mContext, mHdmiDeviceInfo);

                isConnectedToHdmiSwitch =

                        hdmiConnectionRelativePosition

                                != HdmiUtils.HDMI_RELATIVE_POSITION_DIRECTLY_BELOW;

                isConnectedToHdmiSwitch = hdmiConnectionRelativePosition

                                != HdmiUtils.HDMI_RELATIVE_POSITION_DIRECTLY_BELOW

                        && hdmiConnectionRelativePosition

                                != HdmiUtils.HDMI_RELATIVE_POSITION_UNKNOWN;

            } else if (mTvInputHardwareInfo != null) {

                id = generateInputId(componentName, mTvInputHardwareInfo);

                type = sHardwareTypeToTvInputType.get(mTvInputHardwareInfo.getType(), TYPE_TUNER);