summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Moreland <smoreland@google.com>2019-11-06 16:38:17 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-11-06 16:38:17 -0800
commit6e622547a597ac442e7d0381a49be00070f7e4cd (patch)
tree766aaf0f01ea8cfb32ff164e8ba7bf1f5315f7f9
parent64f8753ce91cab67d3ecb1122cf07b21a8aa9468 (diff)
parenta0ae42b8d17025ff043cb0b98ca823572e5a4763 (diff)
downloadnative-6e622547a597ac442e7d0381a49be00070f7e4cd.tar.gz
Sensor: use FlattenableUtils::align am: dbd0eecfc7 am: 4c0d24b5c0 am: fac4161cdf am: ddb9c9924c am: 56fcdad297 am: c3a040236c
am: a0ae42b8d1 Change-Id: I85c977c9ac2cda3c57776aacfae33d3e2afe98b4
-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) {