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

Commit e8097474 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[libprocessgroup] Use new jsoncpp API" am: ff02909c 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1607098

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I96876a4e235a04bf8fbc7ae24dc834f15b9b3447
parents 900c6010 ff02909c

libprocessgroup/setup/cgroup_map_write.cpp

+5 −3
Original line number Diff line number Diff line
@@ -183,10 +183,12 @@ static bool ReadDescriptorsFromFile(const std::string& file_name, 
        return false;

    }



    Json::Reader reader;

    Json::CharReaderBuilder builder;

    std::unique_ptr<Json::CharReader> reader(builder.newCharReader());

    Json::Value root;

    if (!reader.parse(json_doc, root)) {

        LOG(ERROR) << "Failed to parse cgroups description: " << reader.getFormattedErrorMessages();

    std::string errorMessage;

    if (!reader->parse(&*json_doc.begin(), &*json_doc.end(), &root, &errorMessage)) {

        LOG(ERROR) << "Failed to parse cgroups description: " << errorMessage;

        return false;

    }

libprocessgroup/task_profiles.cpp

+5 −3
Original line number Diff line number Diff line
@@ -425,10 +425,12 @@ bool TaskProfiles::Load(const CgroupMap& cg_map, const std::string& file_name) { 
        return false;

    }



    Json::Reader reader;

    Json::CharReaderBuilder builder;

    std::unique_ptr<Json::CharReader> reader(builder.newCharReader());

    Json::Value root;

    if (!reader.parse(json_doc, root)) {

        LOG(ERROR) << "Failed to parse task profiles: " << reader.getFormattedErrorMessages();

    std::string errorMessage;

    if (!reader->parse(&*json_doc.begin(), &*json_doc.end(), &root, &errorMessage)) {

        LOG(ERROR) << "Failed to parse task profiles: " << errorMessage;

        return false;

    }