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

Commit fac490cc authored by Yixiao Luo's avatar Yixiao Luo Committed by Automerger Merge Worker
Browse files

Merge "Support TvInputInfo#getHdmiDeviceInfo() for HDMI physical inputs" am: eeda8def 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2360419



Change-Id: Ie18ec4aa4aa2b00da4f8db56eda57b48784345ea
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cd360930 eeda8def

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

+4 −0
Original line number Diff line number Diff line
@@ -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;