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

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

Snap for 6740034 from 3a7a8b87 to rvc-qpr1-release 

Change-Id: I98c24de2587e1cb21224dc81699b82d1e8689608
parents 1148d8cf 3a7a8b87

init/AndroidTest.xml

+3 −0
Original line number Diff line number Diff line
@@ -29,4 +29,7 @@ 
        <option name="module-name" value="CtsInitTestCases" />

        <option name="runtime-hint" value="65s" />

    </test>

    <!-- Controller that will skip the module if a native bridge situation is detected -->

    <!-- For example: module wants to run arm32 and device is x86 -->

    <object type="module_controller" class="com.android.tradefed.testtype.suite.module.NativeBridgeModuleController" />

</configuration>

libutils/String8.cpp

+7 −1
Original line number Diff line number Diff line
@@ -322,8 +322,14 @@ status_t String8::appendFormatV(const char* fmt, va_list args) 
    n = vsnprintf(nullptr, 0, fmt, tmp_args);

    va_end(tmp_args);



    if (n != 0) {

    if (n < 0) return UNKNOWN_ERROR;



    if (n > 0) {

        size_t oldLength = length();

        if ((size_t)n > SIZE_MAX - 1 ||

            oldLength > SIZE_MAX - (size_t)n - 1) {

            return NO_MEMORY;

        }

        char* buf = lockBuffer(oldLength + n);

        if (buf) {

            vsnprintf(buf + oldLength, n + 1, fmt, args);