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

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

Browse Source 
automerge: cde2617

* commit 'cde261796b3b38e05380ba186cb78350f83e2d30':
  CEC: Fix a bug in HdmiPortInfo.createFromParcel().
This commit is contained in:
Yuncheol Heo
2014-11-14 22:57:33 +00:00
committed by android-build-merger
parent ec74a7e725 cde261796b
commit 376dee63f3
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/hardware/hdmi/HdmiPortInfo.java
View File

@@ -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;
}
}