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

Commit 376dee63 authored by Yuncheol Heo's avatar Yuncheol Heo Committed by android-build-merger
Browse files

am 8977c1da: Merge "CEC: Fix a bug in HdmiPortInfo.createFromParcel()." into lmp-mr1-dev 

automerge: cde26179

* commit 'cde26179':
  CEC: Fix a bug in HdmiPortInfo.createFromParcel().
parents ec74a7e7 cde26179

core/java/android/hardware/hdmi/HdmiPortInfo.java

+12 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ public final class HdmiPortInfo implements Parcelable { 
                    boolean cec = (source.readInt() == 1);

                    boolean arc = (source.readInt() == 1);

                    boolean mhl = (source.readInt() == 1);

                    return new HdmiPortInfo(id, type, address, cec, arc, mhl);

                    return new HdmiPortInfo(id, type, address, cec, mhl, arc);

                }



                @Override
@@ -172,4 +172,15 @@ public final class HdmiPortInfo implements Parcelable { 
        s.append("mhl: ").append(mMhlSupported);

        return s.toString();

    }



    @Override

    public boolean equals(Object o) {

        if (!(o instanceof HdmiPortInfo)) {

            return false;

        }

        final HdmiPortInfo other = (HdmiPortInfo) o;

        return mId == other.mId && mType == other.mType && mAddress == other.mAddress

                && mCecSupported == other.mCecSupported && mArcSupported == other.mArcSupported

                && mMhlSupported == other.mMhlSupported;

    }

}