diff options
| author | 2023-12-07 19:40:12 +0000 | |
|---|---|---|
| committer | 2023-12-07 19:40:12 +0000 | |
| commit | 50ebacbcc8c612997537bea67a181ee29e16b64d (patch) | |
| tree | 1efb433c3fc30ab354952f5f99f9b6dae371ee63 | |
| parent | c599ccb646b539fd3f4c2b8f4b8582d00ebce208 (diff) | |
| parent | 3d74004c6f60f37b06d5a4ba708a1a2879cec787 (diff) | |
Merge "Adapt to libprocessgroup API changes for polling on cgroup.events" into main
| -rw-r--r-- | core/java/android/os/Process.java | 2 | ||||
| -rw-r--r-- | core/jni/android_util_Process.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java index 04525e8b8ff7..9b77b798facf 100644 --- a/core/java/android/os/Process.java +++ b/core/java/android/os/Process.java @@ -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. diff --git a/core/jni/android_util_Process.cpp b/core/jni/android_util_Process.cpp index 91dfc6023e42..43e0c34ab0f3 100644 --- a/core/jni/android_util_Process.cpp +++ b/core/jni/android_util_Process.cpp @@ -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}, |