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

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

Merge "Adapt to libprocessgroup API changes for polling on cgroup.events" into... 

Merge "Adapt to libprocessgroup API changes for polling on cgroup.events" into main am: 50ebacbc am: 6673f7a5 am: 96a6a067

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



Change-Id: I012d745f424b6d010807abde3f210ea35aadda68
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 38f333a2 96a6a067

core/java/android/os/Process.java

+1 −1
Original line number Diff line number Diff line
@@ -1599,7 +1599,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
@@ -1238,7 +1238,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) {

    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)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},