diff options
| author | 2023-12-15 07:47:01 +0000 | |
|---|---|---|
| committer | 2023-12-15 07:47:01 +0000 | |
| commit | d40a9f41d656d74a9d63678980b5549dd0b7b13e (patch) | |
| tree | 7f471b042a9d7e95002fcc40e950cc0ba1d9ba09 | |
| parent | 311d837128a2369dd8a210b3cd2acb3b7dd375ae (diff) | |
| parent | 1f511393be786fee12d8a07861b36ad9007e482a (diff) | |
Merge "Reapply "Adapt to libprocessgroup API changes for polling on cgro..."" into main am: d42e1434e2 am: 06f1e3f2f6 am: 1f511393be
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2876595
Change-Id: I36f2a7e98671af3f01abf335628afeac4bb98341
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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 7e07e1f2e499..fc8523ee23dd 100644 --- a/core/java/android/os/Process.java +++ b/core/java/android/os/Process.java @@ -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. diff --git a/core/jni/android_util_Process.cpp b/core/jni/android_util_Process.cpp index 55100a5347fd..7af69f2dff08 100644 --- a/core/jni/android_util_Process.cpp +++ b/core/jni/android_util_Process.cpp @@ -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}, |