Merge "Actually compare supported color modes." into nyc-mr1-dev (1df0020f) · Commits · e / os / android_frameworks_base

core/java/android/view/Display.java

+27 −0

Original line number	Diff line number	Diff line
		@@ -1227,6 +1227,33 @@ public final class Display {
		return mMinLuminance;
		}

		@Override
		public boolean equals(Object other) {
		if (this == other) {
		return true;
		}

		if (!(other instanceof HdrCapabilities)) {
		return false;
		}
		HdrCapabilities that = (HdrCapabilities) other;

		return Arrays.equals(mSupportedHdrTypes, that.mSupportedHdrTypes)
		&& mMaxLuminance == that.mMaxLuminance
		&& mMaxAverageLuminance == that.mMaxAverageLuminance
		&& mMinLuminance == that.mMinLuminance;
		}

		@Override
		public int hashCode() {
		int hash = 23;
		hash = hash * 17 + Arrays.hashCode(mSupportedHdrTypes);
		hash = hash * 17 + Float.floatToIntBits(mMaxLuminance);
		hash = hash * 17 + Float.floatToIntBits(mMaxAverageLuminance);
		hash = hash * 17 + Float.floatToIntBits(mMinLuminance);
		return hash;
		}

		public static final Creator<HdrCapabilities> CREATOR = new Creator<HdrCapabilities>() {
		@Override
		public HdrCapabilities createFromParcel(Parcel source) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -289,7 +289,7 @@ public final class DisplayInfo implements Parcelable {
		&& modeId == other.modeId
		&& defaultModeId == other.defaultModeId
		&& colorMode == other.colorMode
		&& Objects.equal(supportedColorModes, other.supportedColorModes)
		&& Arrays.equals(supportedColorModes, other.supportedColorModes)
		&& Objects.equal(hdrCapabilities, other.hdrCapabilities)
		&& logicalDensityDpi == other.logicalDensityDpi
		&& physicalXDpi == other.physicalXDpi