summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Moreland <smoreland@google.com>2019-11-06 16:19:12 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-11-06 16:19:12 -0800
commit56fcdad297298ada88b9d59d23554f5c4855d8cf (patch)
tree05af46e3a666f1062970fbd1f38a9718d51093ae
parent65a1504e801ec05b2a34ffe2a81cfafb2335a860 (diff)
parentddb9c9924cc25f2ebf10246fd0d1cc50e8ac51a4 (diff)
downloadnative-56fcdad297298ada88b9d59d23554f5c4855d8cf.tar.gz
Sensor: use FlattenableUtils::align am: dbd0eecfc7 am: 4c0d24b5c0 am: fac4161cdf
am: ddb9c9924c Change-Id: I9d9d10df5ac5f90e84b715062c22faa7dc1ea4ce
-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) {