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

Commit b0828901 authored by Michael Wright's avatar Michael Wright
Browse files

Properly parcel HdrCapabilities. 

Since the field might be null, we can't just read and write the
object directly. Use Parcel's convenience methods to do so safely
instead.

Bug: 28427070
Change-Id: I6460c9cb43dc6da97d5fd9edeaa78bdaaf105446
parent 596a4a15

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);