diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-11-15 06:16:02 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-11-15 06:16:02 +0000 |
| commit | 1bd17e25559b6f010fbb805620a30ed5ecd3a7e5 (patch) | |
| tree | cdda9ad7b5492ca376aff96f536796ad7a442f27 | |
| parent | 77e84a09ead77fdf0dd4b08704ab00970a4d3da6 (diff) | |
| parent | 9bf1115832045dce1fa57035a8ce2df01512abef (diff) | |
| download | native-1bd17e25559b6f010fbb805620a30ed5ecd3a7e5.tar.gz | |
Merge cherrypicks of [9736358, 9736296, 9735406, 9736235, 9736059, 9736060, 9736236, 9736297, 9736298, 9735210, 9735309] into qt-qpr1-releaseandroid-10.0.0_r22android-10.0.0_r21
Change-Id: I6c9dd540f6fe5becd92942427a4b51e2c65597cb
| -rw-r--r-- | libs/sensor/Sensor.cpp | 3 |
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) { |