Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I36cad560a43862c38c3b2749876a7a6fe436c9ad
This commit is contained in:
Treehugger Robot
2021-01-20 00:45:08 +00:00
committed by Automerger Merge Worker
parent 869fe2b548 9923250234
commit a5a278129c
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
media/java/android/media/tv/TvInputHardwareInfo.java
View File

@@ -190,13 +190,16 @@ public final class TvInputHardwareInfo implements Parcelable {
/** @hide */ /** @hide */
public Builder toBuilder() { public Builder toBuilder() {
return new Builder() Builder newBuilder = new Builder()
.deviceId(mDeviceId) .deviceId(mDeviceId)
.type(mType) .type(mType)
.audioType(mAudioType) .audioType(mAudioType)
.audioAddress(mAudioAddress) .audioAddress(mAudioAddress)
.hdmiPortId(mHdmiPortId)
.cableConnectionStatus(mCableConnectionStatus); .cableConnectionStatus(mCableConnectionStatus);
if (mType == TV_INPUT_TYPE_HDMI) {
newBuilder.hdmiPortId(mHdmiPortId);
}
return newBuilder;
} }
public static final class Builder { public static final class Builder {