summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
author Steven Moreland <smoreland@google.com> 2019-10-08 18:15:10 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-10-08 18:15:10 +0000
commit1b871b51b6ae4bf261ecf40df273919c064d19d3 (patch)
tree19eef5a4b02bb8ae68fcbd5461824c711d3f84fa /libs
parent55d7b34594335772df70087bdd249a3d43eca226 (diff)
parentd58cf5acb863eddbbeb9982439965e259045940e (diff)
Merge "Sensor: use FlattenableUtils::align"
Diffstat (limited to 'libs')
-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) {