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

Commit 5213e228 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [9736158, 9736323, 9736226, 9736227, 9736476, 9736477,... 

Merge cherrypicks of [9736158, 9736323, 9736226, 9736227, 9736476, 9736477, 9736478, 9736176, 9736136] into qt-qpr1-b-release

Change-Id: I8336fc6cb93082493bc34cf0dc33c1081369e715
parents 77e84a09 6c524a53

libs/sensor/Sensor.cpp

+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) {