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

Commit f0678d78 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't set hdmiPortId for non HDMI device." am: 99232502 am: a5a27812 am: 36605e33 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icbcfe59347f232eafde5360530720e3e34743b5a
parents adcf909b 36605e33

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

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