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

Commit ee1bb344 authored by Michael Wright's avatar Michael Wright Committed by android-build-merger
Browse files

Merge "Properly parcel HdrCapabilities." into nyc-dev 

am: 5bddeaa9

* commit '5bddeaa9':
  Properly parcel HdrCapabilities.

Change-Id: I7ace76443cc1780dea1bfb36f3eb36d2f53c20b3
parents f84e71b5 5bddeaa9

core/java/android/view/DisplayInfo.java

+2 −2
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ public final class DisplayInfo implements Parcelable { 
        for (int i = 0; i < nColorTransforms; i++) {

            supportedColorTransforms[i] = Display.ColorTransform.CREATOR.createFromParcel(source);

        }

        hdrCapabilities = Display.HdrCapabilities.CREATOR.createFromParcel(source);

        hdrCapabilities = source.readParcelable(null);

        logicalDensityDpi = source.readInt();

        physicalXDpi = source.readFloat();

        physicalYDpi = source.readFloat();
@@ -424,7 +424,7 @@ public final class DisplayInfo implements Parcelable { 
        for (int i = 0; i < supportedColorTransforms.length; i++) {

            supportedColorTransforms[i].writeToParcel(dest, flags);

        }

        hdrCapabilities.writeToParcel(dest, flags);

        dest.writeParcelable(hdrCapabilities, flags);

        dest.writeInt(logicalDensityDpi);

        dest.writeFloat(physicalXDpi);

        dest.writeFloat(physicalYDpi);