commit cc10a04f87c76a03cdc3f62712554ce15e710fb1
author Martijn Coenen <maco@google.com> Wed Jan 08 08:09:47 2020 -0800
committer android-build-merger <android-build-merger@google.com> Wed Jan 08 08:09:47 2020 -0800
tree a0fdf1773099de81f2136bbcdd4678342bb8f26c
parent e4388a6ff9b26fa70dd68acfb01e2ad991707fd6
parent 105e189e41b11e578482773bd07ecddf9a145d14

Merge "Don't remove OBBs when clearing app data."
am: 105e189e41

Change-Id: I831abb95671588a17e4c69b506df955280e573c9

libs/sensor/Sensor.cpp

diff --git a/libs/sensor/Sensor.cpp b/libs/sensor/Sensor.cpp
index 139987e..abc9103 100644
--- a/libs/sensor/Sensor.cpp
+++ b/libs/sensor/Sensor.cpp
@@ -577,7 +577,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) {