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

Commit 8adb71ff authored by T.J. Mercier's avatar T.J. Mercier Committed by Automerger Merge Worker
Browse files

Merge "Revert "Adapt to libprocessgroup API changes for polling on cgro...""... 

Merge "Revert "Adapt to libprocessgroup API changes for polling on cgro..."" into main am: 52553bec

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2865115



Change-Id: Id93aec624e12daa93dd5e0999b1cf41d0419d374
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6ffb03a3 52553bec

core/java/android/os/Process.java

+1 −1
Original line number Diff line number Diff line
@@ -1505,7 +1505,7 @@ public class Process { 
     * fully removed, otherwise system resources may leak.

     * @hide

     */

    public static final native boolean sendSignalToProcessGroup(int uid, int pid, int signal);

    public static final native int sendSignalToProcessGroup(int uid, int pid, int signal);



    /**

      * Freeze the cgroup for the given UID.

core/jni/android_util_Process.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1238,7 +1238,7 @@ jint android_os_Process_killProcessGroup(JNIEnv* env, jobject clazz, jint uid, j 
    return killProcessGroup(uid, pid, SIGKILL);

}



jboolean android_os_Process_sendSignalToProcessGroup(JNIEnv* env, jobject clazz, jint uid, jint pid,

jint android_os_Process_sendSignalToProcessGroup(JNIEnv* env, jobject clazz, jint uid, jint pid,

                                                 jint signal) {

    return sendSignalToProcessGroup(uid, pid, signal);

}
@@ -1310,7 +1310,7 @@ static const JNINativeMethod methods[] = { 
        //{"setApplicationObject", "(Landroid/os/IBinder;)V",

        //(void*)android_os_Process_setApplicationObject},

        {"killProcessGroup", "(II)I", (void*)android_os_Process_killProcessGroup},

        {"sendSignalToProcessGroup", "(III)Z", (void*)android_os_Process_sendSignalToProcessGroup},

        {"sendSignalToProcessGroup", "(III)I", (void*)android_os_Process_sendSignalToProcessGroup},

        {"removeAllProcessGroups", "()V", (void*)android_os_Process_removeAllProcessGroups},

        {"nativePidFdOpen", "(II)I", (void*)android_os_Process_nativePidFdOpen},

        {"freezeCgroupUid", "(IZ)V", (void*)android_os_Process_freezeCgroupUID},