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>
This commit is contained in:
@@ -946,6 +946,10 @@ public final class TvInputInfo implements Parcelable {
|
|||||||
id = generateInputId(componentName, mTvInputHardwareInfo);
|
id = generateInputId(componentName, mTvInputHardwareInfo);
|
||||||
type = sHardwareTypeToTvInputType.get(mTvInputHardwareInfo.getType(), TYPE_TUNER);
|
type = sHardwareTypeToTvInputType.get(mTvInputHardwareInfo.getType(), TYPE_TUNER);
|
||||||
isHardwareInput = true;
|
isHardwareInput = true;
|
||||||
|
if (mTvInputHardwareInfo.getType() == TvInputHardwareInfo.TV_INPUT_TYPE_HDMI) {
|
||||||
|
mHdmiDeviceInfo = HdmiDeviceInfo.hardwarePort(
|
||||||
|
HdmiDeviceInfo.PATH_INVALID, mTvInputHardwareInfo.getHdmiPortId());
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
id = generateInputId(componentName);
|
id = generateInputId(componentName);
|
||||||
type = TYPE_TUNER;
|
type = TYPE_TUNER;
|
||||||
|
|||||||
Reference in New Issue
Block a user