commit 8a3083eecacc46eafba56ad416dee026c5dddff4
author Garfield Tan <xutan@google.com> Mon Dec 03 13:21:07 2018 -0800
committer Marissa Wall <marissaw@google.com> Tue Dec 04 13:01:45 2018 -0800
tree 882227343d1f7f2c65769f9407fe894f6547eae6
parent face176394e0a28bd7b7b8bed13b4696e79668a2

Change what in layer_state_t to 64 bit.

We finally reached the edge of 32 bit enum for it in ag/5659622.

Bug: None
Test: Builds.
Change-Id: If2bab78980caf061f100ed7d75d112882b9e0133

libs/gui/LayerState.cpp

diff --git a/libs/gui/LayerState.cpp b/libs/gui/LayerState.cpp
index 407eecb..4f63415 100644
--- a/libs/gui/LayerState.cpp
+++ b/libs/gui/LayerState.cpp
@@ -16,6 +16,8 @@
 
 #define LOG_TAG "LayerState"
 
+#include <inttypes.h>
+
 #include <utils/Errors.h>
 #include <binder/Parcel.h>
 #include <gui/ISurfaceComposerClient.h>
@@ -27,7 +29,7 @@
 status_t layer_state_t::write(Parcel& output) const
 {
     output.writeStrongBinder(surface);
-    output.writeUint32(what);
+    output.writeUint64(what);
     output.writeFloat(x);
     output.writeFloat(y);
     output.writeInt32(z);
@@ -97,7 +99,7 @@
 status_t layer_state_t::read(const Parcel& input)
 {
     surface = input.readStrongBinder();
-    what = input.readUint32();
+    what = input.readUint64();
     x = input.readFloat();
     y = input.readFloat();
     z = input.readInt32();
@@ -366,7 +368,7 @@
 
     if ((other.what & what) != other.what) {
         ALOGE("Unmerged SurfaceComposer Transaction properties. LayerState::merge needs updating? "
-              "other.what=0x%X what=0x%X",
+              "other.what=0x%" PRIu64 " what=0x%" PRIu64,
               other.what, what);
     }
 }