commit fac4161cdf50267027e7faa182bd04f30564265c
author Steven Moreland <smoreland@google.com> Wed Nov 06 16:07:00 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Nov 06 16:07:00 2019 -0800
tree dc6fdc6953b9a38561a28bea44d6f5ed0670be9a
parent f3f9cff35355e146c2c52aef10e9f8b8ae166065
parent 4c0d24b5c041250b9c15430c879f3e5a457e0b5b

Sensor: use FlattenableUtils::align am: dbd0eecfc7
am: 4c0d24b5c0

Change-Id: I5ea52d7c950cc2d3ad4b72674bb638b3d1e93e8e

libs/sensor/Sensor.cpp

diff --git a/libs/sensor/Sensor.cpp b/libs/sensor/Sensor.cpp
index a0e368c..2383516 100644
--- a/libs/sensor/Sensor.cpp
+++ b/libs/sensor/Sensor.cpp
@@ -562,7 +562,8 @@
     uint32_t len = static_cast<uint32_t>(string8.length());
     FlattenableUtils::write(buffer, size, len);
     memcpy(static_cast<char*>(buffer), string8.string(), len);
-    FlattenableUtils::advance(buffer, size, FlattenableUtils::align<4>(len));
+    FlattenableUtils::advance(buffer, size, len);
+    size -= FlattenableUtils::align<4>(buffer);
 }
 
 bool Sensor::unflattenString8(void const*& buffer, size_t& size, String8& outputString8) {