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

Commit 5b8df970 authored by Benjamin Schwartz's avatar Benjamin Schwartz Committed by Automerger Merge Worker
Browse files

Merge "BatteryStatsService: Allow unknown wakeup string" am: 754d78cb am:... 

Merge "BatteryStatsService: Allow unknown wakeup string" am: 754d78cb am: 32ae8903 am: f5c63771

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531984

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7fc06889dd782b73044512e90c02cb130697a01c
parents 0bccbf5b f5c63771

services/core/jni/com_android_server_am_BatteryStatsService.cpp

+7 −59
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ 
#include <utils/misc.h>

#include <utils/Log.h>



#include <android-base/strings.h>



using android::hardware::hidl_vec;

using android::hardware::Return;

using android::hardware::Void;
@@ -198,67 +200,13 @@ static jint nativeWaitWakeup(JNIEnv *env, jobject clazz, jobject outBuf) 
        return 0;

    }



    char* mergedreasonpos = mergedreason;

    int i = 0;

    for (auto wakeupReason : wakeupReasons) {

        auto reasonline = const_cast<char*>(wakeupReason.c_str());

        char* pos = reasonline;

        char* endPos;

        int len;

        // First field is the index or 'Abort'.

        int irq = (int)strtol(pos, &endPos, 10);

        if (pos != endPos) {

            // Write the irq number to the merged reason string.

            len = snprintf(mergedreasonpos, remainreasonlen, i == 0 ? "%d" : ":%d", irq);

        } else {

            // The first field is not an irq, it may be the word Abort.

            const size_t abortPrefixLen = strlen("Abort:");

            if (strncmp(pos, "Abort:", abortPrefixLen) != 0) {

                // Ooops.

                ALOGE("Bad reason line: %s", reasonline);

                continue;

            }



            // Write 'Abort' to the merged reason string.

            len = snprintf(mergedreasonpos, remainreasonlen, i == 0 ? "Abort" : ":Abort");

            endPos = pos + abortPrefixLen;

        }

        pos = endPos;



        if (len >= 0 && len < remainreasonlen) {

            mergedreasonpos += len;

            remainreasonlen -= len;

        }



        // Skip whitespace; rest of the buffer is the reason string.

        while (*pos == ' ') {

            pos++;

        }



        // Chop newline at end.

        char* endpos = pos;

        while (*endpos != 0) {

            if (*endpos == '\n') {

                *endpos = 0;

                break;

            }

            endpos++;

        }

    std::string mergedReasonStr = ::android::base::Join(wakeupReasons, ":");

    strncpy(mergedreason, mergedReasonStr.c_str(), remainreasonlen);

    mergedreason[remainreasonlen - 1] = '\0';



        len = snprintf(mergedreasonpos, remainreasonlen, ":%s", pos);

        if (len >= 0 && len < remainreasonlen) {

            mergedreasonpos += len;

            remainreasonlen -= len;

        }

        i++;

    }



    ALOGV("Got %d reasons", i);

    if (i > 0) {

        *mergedreasonpos = 0;

    }

    ALOGV("Got %d reasons", (int)wakeupReasons.size());



    return mergedreasonpos - mergedreason;

    return strlen(mergedreason);

}



static bool checkPowerStatsHalResultLocked(const Return<void>& ret, const char* function)