diff options
| author | Henry Fang <quxiangfang@google.com> | 2021-01-19 13:40:57 -0800 |
|---|---|---|
| committer | Henry Fang <quxiangfang@google.com> | 2021-01-19 13:40:57 -0800 |
| commit | 2f4cec96c57b56f7145a0e6ce1dbf5b8289db43a (patch) | |
| tree | 3b93e345e7f8a1088f3f6807e430e36880fd92e3 /media | |
| parent | 48a1062811a6a1e66d20fdf169afd02fc7b9722e (diff) | |
Don't set hdmiPortId for non HDMI device.
bug: 142698113
Test: Manaul
Change-Id: I2876dacb07e4ebb4ed43c5e95b14ab84c8d935cb
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/tv/TvInputHardwareInfo.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/media/java/android/media/tv/TvInputHardwareInfo.java b/media/java/android/media/tv/TvInputHardwareInfo.java index 1249e0d3cb0f..0bedbd3c1f46 100644 --- a/media/java/android/media/tv/TvInputHardwareInfo.java +++ b/media/java/android/media/tv/TvInputHardwareInfo.java @@ -190,13 +190,16 @@ public final class TvInputHardwareInfo implements Parcelable { /** @hide */ public Builder toBuilder() { - return new Builder() + Builder newBuilder = new Builder() .deviceId(mDeviceId) .type(mType) .audioType(mAudioType) .audioAddress(mAudioAddress) - .hdmiPortId(mHdmiPortId) .cableConnectionStatus(mCableConnectionStatus); + if (mType == TV_INPUT_TYPE_HDMI) { + newBuilder.hdmiPortId(mHdmiPortId); + } + return newBuilder; } public static final class Builder { |