commit 0f056f080d4766523a396c6efb3ae224f287e9ca
author Brian Anderson <brianderson@google.com> Mon Oct 10 16:06:21 2016 -0700
committer Brian Anderson <brianderson@google.com> Wed Dec 14 11:58:05 2016 -0800
tree 147509358743f6d8c8b13637bd0436fdff4c5cb0
parent 4565daa628d914f05dabfeca83d2e5ee07936a99

Align properly in BufferItem::getFlattenedSize.

Test: SurfaceFlinger still works.

Change-Id: I7b5ef08d33a18f98d485f57e461604ed65b657f1

libs/gui/BufferItem.cpp

diff --git a/libs/gui/BufferItem.cpp b/libs/gui/BufferItem.cpp
index ec2a9a6..69b5962 100644
--- a/libs/gui/BufferItem.cpp
+++ b/libs/gui/BufferItem.cpp
@@ -91,11 +91,11 @@
     size_t size = sizeof(uint32_t); // Flags
     if (mGraphicBuffer != 0) {
         size += mGraphicBuffer->getFlattenedSize();
-        FlattenableUtils::align<4>(size);
+        size = FlattenableUtils::align<4>(size);
     }
     if (mFence != 0) {
         size += mFence->getFlattenedSize();
-        FlattenableUtils::align<4>(size);
+        size = FlattenableUtils::align<4>(size);
     }
     size += mSurfaceDamage.getFlattenedSize();
     size = FlattenableUtils::align<8>(size);