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

Commit 7a5895d0 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

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



Change-Id: Ie6a63b0fd704e754cac063dfba0006712d3a3495
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 503fa1ec 8cabf4be
Loading
Loading
Loading
Loading
+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) {