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

Commit 0f6a8532 authored by Suren Baghdasaryan's avatar Suren Baghdasaryan
Browse files

resolve merge conflicts of ed81cc26 to qt-r1-dev-plus-aosp 

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9cc45ecad961f3aee1753679636a1919c797d7fc
parents 77abafd8 ed81cc26

libprocessgroup/cgroup_map.cpp

+8 −0
Original line number Diff line number Diff line
@@ -67,6 +67,13 @@ bool CgroupController::HasValue() const { 
    return controller_ != nullptr;

}



bool CgroupController::IsUsable() const {

    if (!HasValue()) return false;



    uint32_t flags = ACgroupController_getFlags(controller_);

    return (flags & CGROUPRC_CONTROLLER_FLAG_MOUNTED) != 0;

}



std::string CgroupController::GetTasksFilePath(const std::string& rel_path) const {

    std::string tasks_path = path();
@@ -153,6 +160,7 @@ void CgroupMap::Print() const { 
        const ACgroupController* controller = ACgroupFile_getController(i);

        LOG(INFO) << "\t" << ACgroupController_getName(controller) << " ver "

                  << ACgroupController_getVersion(controller) << " path "

                  << ACgroupController_getFlags(controller) << " flags "

                  << ACgroupController_getPath(controller);

    }

}

libprocessgroup/cgroup_map.h

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ class CgroupController { 
    const char* path() const;



    bool HasValue() const;

    bool IsUsable() const;



    std::string GetTasksFilePath(const std::string& path) const;

    std::string GetProcsFilePath(const std::string& path, uid_t uid, pid_t pid) const;

libprocessgroup/cgrouprc/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -43,19 +43,19 @@ cc_library { 
        "libcgrouprc_format",

    ],

    stubs: {

        symbol_file: "libcgrouprc.map.txt",

        symbol_file: "libcgrouprc.llndk.txt",

        versions: ["29"],

    },

    target: {

        linux: {

            version_script: "libcgrouprc.map.txt",

            version_script: "libcgrouprc.llndk.txt",

        },

    },

}



llndk_library {

    name: "libcgrouprc",

    symbol_file: "libcgrouprc.map.txt",

    symbol_file: "libcgrouprc.llndk.txt",

    native_bridge_supported: true,

    export_include_dirs: [

        "include",

libprocessgroup/cgrouprc/cgroup_controller.cpp

+5 −0
Original line number Diff line number Diff line
@@ -27,6 +27,11 @@ uint32_t ACgroupController_getVersion(const ACgroupController* controller) { 
    return controller->version();

}



uint32_t ACgroupController_getFlags(const ACgroupController* controller) {

    CHECK(controller != nullptr);

    return controller->flags();

}



const char* ACgroupController_getName(const ACgroupController* controller) {

    CHECK(controller != nullptr);

    return controller->name();

libprocessgroup/cgrouprc/include/android/cgrouprc.h

+12 −0
Original line number Diff line number Diff line
@@ -65,6 +65,18 @@ __attribute__((warn_unused_result)) const ACgroupController* ACgroupFile_getCont 
__attribute__((warn_unused_result)) uint32_t ACgroupController_getVersion(const ACgroupController*)

        __INTRODUCED_IN(29);



/**

 * Flag bitmask used in ACgroupController_getFlags

 */

#define CGROUPRC_CONTROLLER_FLAG_MOUNTED 0x1



/**

 * Returns the flags bitmask of the given controller.

 * If the given controller is null, return 0.

 */

__attribute__((warn_unused_result)) uint32_t ACgroupController_getFlags(const ACgroupController*)

        __INTRODUCED_IN(29);



/**

 * Returns the name of the given controller.

 * If the given controller is null, return nullptr.