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

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

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

Merge "Reapply "Adapt to libprocessgroup API changes for polling on cgro..."" into main am: d42e1434

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



Change-Id: Ifaecd41f4a1cc8013c80c6a5b490aef03170364a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1c66bd0b d42e1434

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 int sendSignalToProcessGroup(int uid, int pid, int signal);

    public static final native boolean 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
@@ -1262,7 +1262,7 @@ jint android_os_Process_killProcessGroup(JNIEnv* env, jobject clazz, jint uid, j 
    return killProcessGroup(uid, pid, SIGKILL);

}



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

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

                                                 jint signal) {

    if (uid < 0) {

        return jniThrowExceptionFmt(env, "java/lang/IllegalArgumentException",
@@ -1344,7 +1344,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)I", (void*)android_os_Process_sendSignalToProcessGroup},

        {"sendSignalToProcessGroup", "(III)Z", (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},