diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-01-19 23:59:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-01-19 23:59:10 +0000 |
| commit | 9923250234d691bcafe4bb0ec3f5960b87281642 (patch) | |
| tree | 00631f9f50154fe8a2b5d1522a9254eee905172f /media | |
| parent | 942b71b485932b19c58cfc939c1ffce2977b4084 (diff) | |
| parent | 2f4cec96c57b56f7145a0e6ce1dbf5b8289db43a (diff) | |
Merge "Don't set hdmiPortId for non HDMI device."
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 { |