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

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

Merge "libprocessgroup: UIDs in linux are unsigned" into main am: f8d02eee... 

Merge "libprocessgroup: UIDs in linux are unsigned" into main am: f8d02eee am: 01d4fdfa am: 8cabf4be am: 7a5895d0

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



Change-Id: I37fb4f8250586826e7461a2e6b0276cc15e06f1f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 05e1cdb3 7a5895d0

libprocessgroup/processgroup.cpp

+2 −2
Original line number Diff line number Diff line
@@ -206,11 +206,11 @@ bool SetUserProfiles(uid_t uid, const std::vector<std::string>& profiles) { 
}



static std::string ConvertUidToPath(const char* cgroup, uid_t uid) {

    return StringPrintf("%s/uid_%d", cgroup, uid);

    return StringPrintf("%s/uid_%u", cgroup, uid);

}



static std::string ConvertUidPidToPath(const char* cgroup, uid_t uid, int pid) {

    return StringPrintf("%s/uid_%d/pid_%d", cgroup, uid, pid);

    return StringPrintf("%s/uid_%u/pid_%d", cgroup, uid, pid);

}



static int RemoveProcessGroup(const char* cgroup, uid_t uid, int pid, unsigned int retries) {