commit 9923250234d691bcafe4bb0ec3f5960b87281642
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jan 19 23:59:10 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 19 23:59:10 2021 +0000
tree 00631f9f50154fe8a2b5d1522a9254eee905172f
parent 942b71b485932b19c58cfc939c1ffce2977b4084
parent 2f4cec96c57b56f7145a0e6ce1dbf5b8289db43a

Merge "Don't set hdmiPortId for non HDMI device."

media/java/android/media/tv/TvInputHardwareInfo.java

diff --git a/media/java/android/media/tv/TvInputHardwareInfo.java b/media/java/android/media/tv/TvInputHardwareInfo.java
index 1249e0d..0bedbd3 100644
--- a/media/java/android/media/tv/TvInputHardwareInfo.java
+++ b/media/java/android/media/tv/TvInputHardwareInfo.java
@@ -190,13 +190,16 @@
 
     /** @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 {