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

Merge "Properly parcel HdrCapabilities." into nyc-dev

Browse Source 
am: 5bddeaa

* commit '5bddeaa9bce6325c900eeabaa6a1cdfaf83910c6':
  Properly parcel HdrCapabilities.

Change-Id: I7ace76443cc1780dea1bfb36f3eb36d2f53c20b3
This commit is contained in:
Michael Wright
2016-04-28 15:05:42 +00:00
committed by android-build-merger
parent f84e71b556 5bddeaa9bc
commit ee1bb344d7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/view/DisplayInfo.java
View File

@@ -380,7 +380,7 @@ public final class DisplayInfo implements Parcelable {
for (int i = 0; i < nColorTransforms; i++) { for (int i = 0; i < nColorTransforms; i++) {
supportedColorTransforms[i] = Display.ColorTransform.CREATOR.createFromParcel(source); supportedColorTransforms[i] = Display.ColorTransform.CREATOR.createFromParcel(source);
} }
hdrCapabilities = Display.HdrCapabilities.CREATOR.createFromParcel(source); hdrCapabilities = source.readParcelable(null);
logicalDensityDpi = source.readInt(); logicalDensityDpi = source.readInt();
physicalXDpi = source.readFloat(); physicalXDpi = source.readFloat();
physicalYDpi = source.readFloat(); physicalYDpi = source.readFloat();
@@ -424,7 +424,7 @@ public final class DisplayInfo implements Parcelable {
for (int i = 0; i < supportedColorTransforms.length; i++) { for (int i = 0; i < supportedColorTransforms.length; i++) {
supportedColorTransforms[i].writeToParcel(dest, flags); supportedColorTransforms[i].writeToParcel(dest, flags);
} }
hdrCapabilities.writeToParcel(dest, flags); dest.writeParcelable(hdrCapabilities, flags);
dest.writeInt(logicalDensityDpi); dest.writeInt(logicalDensityDpi);
dest.writeFloat(physicalXDpi); dest.writeFloat(physicalXDpi);
dest.writeFloat(physicalYDpi); dest.writeFloat(physicalYDpi);