From 9e620f65afcfe27bdff7e201ce982e61288ff6b7 Mon Sep 17 00:00:00 2001 From: Yixiao Luo Date: Thu, 15 Dec 2022 12:39:19 -0800 Subject: [PATCH] Support TvInputInfo#getHdmiDeviceInfo() for HDMI physical inputs create HdmiDeviceInfo by TvInputHardwareInfo in TvInputInfo.Builder#build() when TvInputHardwareInfo#getType() == TV_INPUT_TYPE_HDMI && HdmiDeviceInfo == null. Test: mmm Bug: 244143511 Change-Id: Ic42c7584ae31f763e81dab1e0c8ba56ade484889 --- media/java/android/media/tv/TvInputInfo.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/media/java/android/media/tv/TvInputInfo.java b/media/java/android/media/tv/TvInputInfo.java index e60d5378f88c4..667a9aef59f35 100644 --- a/media/java/android/media/tv/TvInputInfo.java +++ b/media/java/android/media/tv/TvInputInfo.java @@ -946,6 +946,10 @@ public final class TvInputInfo implements Parcelable { id = generateInputId(componentName, mTvInputHardwareInfo); type = sHardwareTypeToTvInputType.get(mTvInputHardwareInfo.getType(), TYPE_TUNER); isHardwareInput = true; + if (mTvInputHardwareInfo.getType() == TvInputHardwareInfo.TV_INPUT_TYPE_HDMI) { + mHdmiDeviceInfo = HdmiDeviceInfo.hardwarePort( + HdmiDeviceInfo.PATH_INVALID, mTvInputHardwareInfo.getHdmiPortId()); + } } else { id = generateInputId(componentName); type = TYPE_TUNER;