Android-x86
Forkframeworks/native
| Revisión | ab32ecdfa91534eb49ce884bb6cc26ed63095d4a (tree) |
|---|---|
| Tiempo | 2020-01-20 19:55:55 |
| Autor | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
Merge tag 'android-9.0.0_r52' into pie-x86
Android 9.0.0 release 52
libs/sensor/Sensor.cpp (diff)| @@ -562,7 +562,8 @@ void Sensor::flattenString8(void*& buffer, size_t& size, | ||
| 562 | 562 | uint32_t len = static_cast<uint32_t>(string8.length()); |
| 563 | 563 | FlattenableUtils::write(buffer, size, len); |
| 564 | 564 | memcpy(static_cast<char*>(buffer), string8.string(), len); |
| 565 | - FlattenableUtils::advance(buffer, size, FlattenableUtils::align<4>(len)); | |
| 565 | + FlattenableUtils::advance(buffer, size, len); | |
| 566 | + size -= FlattenableUtils::align<4>(buffer); | |
| 566 | 567 | } |
| 567 | 568 | |
| 568 | 569 | bool Sensor::unflattenString8(void const*& buffer, size_t& size, String8& outputString8) { |
