Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6458a892 authored by Xin Li's avatar Xin Li
Browse files

DO NOT MERGE - Merge QQ1A.200105.003 into stage-aosp-master

Change-Id: I4f8b60463d302305db7e0efea7f9664d799b61a4
parents 041020b5 1bd17e25
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -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) {