summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Moreland <smoreland@google.com>2019-11-06 16:26:10 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-11-06 16:26:10 -0800
commitc3a040236c18d3dda7c17eea3f4cb6fb9eb850bd (patch)
tree63366c1d0e71f176551f4cbc1cc242a0f105c540
parent2a5a4d978243e0b0ca55e4f999481eda2b121e9b (diff)
parent56fcdad297298ada88b9d59d23554f5c4855d8cf (diff)
downloadnative-c3a040236c18d3dda7c17eea3f4cb6fb9eb850bd.tar.gz
Sensor: use FlattenableUtils::align am: dbd0eecfc7 am: 4c0d24b5c0 am: fac4161cdf am: ddb9c9924c
am: 56fcdad297 Change-Id: I4f4fbaa6670c0be249e1fbf01681566d5271c267
-rw-r--r--libs/sensor/Sensor.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/sensor/Sensor.cpp b/libs/sensor/Sensor.cpp
index 139987e6a9..abc910302c 100644
--- a/libs/sensor/Sensor.cpp
+++ b/libs/sensor/Sensor.cpp
@@ -577,7 +577,8 @@ void Sensor::flattenString8(void*& buffer, size_t& size,
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) {