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

Commit 363f166f authored by Yi Kong's avatar Yi Kong Committed by android-build-merger
Browse files

strtoul result shouldn't be narrowed to uint32_t before checking for ULONG_MAX am: 69e8325e 

am: 0d5b2cf5

Change-Id: Ifd02485ac4f2e73addf39f4ba0b6e2b32ca9e9c8
parents 8a27154f 0d5b2cf5

power/stats/1.0/default/PowerStats.cpp

+6 −5
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ size_t PowerStats::parsePowerRails() { 
    std::string railFileName;

    std::string spsFileName;

    uint32_t index = 0;

    uint32_t samplingRate;

    unsigned long samplingRate;

    for (const auto& path : mPm.devicePaths) {

        railFileName = path + "/enabled_rails";

        spsFileName = path + "/sampling_rate";
@@ -109,10 +109,11 @@ size_t PowerStats::parsePowerRails() { 
        while (std::getline(railNames, line)) {

            std::vector<std::string> words = android::base::Split(line, ":");

            if (words.size() == 2) {

                mPm.railsInfo.emplace(words[0], RailData{.devicePath = path,

                mPm.railsInfo.emplace(

                        words[0], RailData{.devicePath = path,

                                           .index = index,

                                           .subsysName = words[1],

                                                         .samplingRate = samplingRate});

                                           .samplingRate = static_cast<uint32_t>(samplingRate)});

                index++;

            } else {

                ALOGW("Unexpected format in file: %s", railFileName.c_str());