summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hongguang Chen <hgchen@google.com> 2023-10-11 18:08:50 -0700
committer Hongguang Chen <hgchen@google.com> 2023-10-12 01:40:15 +0000
commit6185cc12f3e90fa2abb9f6e5537c14be4c53ae74 (patch)
tree772fae35c23a93b2002a932a22ae07705667bf94
parent4c5adb3273e3ec53b54c9fea877b3eed9d0e0a0a (diff)
Do not treat HDMI_RELATIVE_POSITION_UNKNOWN as a HDMI switch
Fix: 304599865 Test: manual Change-Id: I3e21aa6e693ed7350a3aa236483ffe4b8b68d888
-rw-r--r--media/java/android/media/tv/TvInputInfo.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/media/java/android/media/tv/TvInputInfo.java b/media/java/android/media/tv/TvInputInfo.java
index 667a9aef59f3..13f7743f8d26 100644
--- a/media/java/android/media/tv/TvInputInfo.java
+++ b/media/java/android/media/tv/TvInputInfo.java
@@ -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);