| commit | fac490ccb56bf5888645b6acba4902beb1f92763 | [log] [tgz] |
|---|---|---|
| author | Yixiao Luo <yixiaoluo@google.com> | Thu Dec 22 19:04:17 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 22 19:04:17 2022 +0000 |
| tree | 7d63d0ed8826a4a49a762426c06f1581980bbbe4 | |
| parent | cd3609306deb8e205b7a4d48f14fcd801012ac51 [diff] | |
| parent | eeda8def353e0b2d32c28230b21d784a0cdcc1da [diff] |
Merge "Support TvInputInfo#getHdmiDeviceInfo() for HDMI physical inputs" am: eeda8def35 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2360419 Change-Id: Ie18ec4aa4aa2b00da4f8db56eda57b48784345ea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/java/android/media/tv/TvInputInfo.java b/media/java/android/media/tv/TvInputInfo.java index e60d537..667a9ae 100644 --- a/media/java/android/media/tv/TvInputInfo.java +++ b/media/java/android/media/tv/TvInputInfo.java
@@ -946,6 +946,10 @@ 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;