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

Commit 99232502 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 942b71b4 2f4cec96

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

+5 −2
Original line number Diff line number Diff line
@@ -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 {