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

Merge "Properly parcel HdrCapabilities." into nyc-dev am: 5bddeaa

Browse Source 
am: ee1bb34

* commit 'ee1bb344d7ad362646428ede48f2e99449275b1c':
  Properly parcel HdrCapabilities.

Change-Id: Ide481e792a93d7a7841085c69bcd9d24f82c1f1c
This commit is contained in:
TreeHugger Robot
2016-04-28 15:09:19 +00:00
committed by android-build-merger
parent 96a3c740a9 ee1bb344d7
commit 38723c00d5
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++) {
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);