diff options
| author | 2023-12-08 03:19:02 +0000 | |
|---|---|---|
| committer | 2023-12-08 03:19:02 +0000 | |
| commit | 58d0a2b495e7f910fb473c6f85ccb9597c52d296 (patch) | |
| tree | 8c511591dbab9bb5ab2a9161dbbc8dd1ce123d47 | |
| parent | 2db4623ce96b9e1d57fb4dc3e779ae824322b75f (diff) | |
| parent | 3786cf3fe5e00176b21f558ca939f92be580cb67 (diff) | |
Merge "Revert "Adapt to libprocessgroup API changes for polling on cgro..."" into main am: 52553becb6 am: 8adb71ff82 am: 3786cf3fe5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2865115
Change-Id: I9c5d3d8b30df3def83c0cb984d8d0dda465003c4
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 fc8523ee23dd..7e07e1f2e499 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 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. diff --git a/core/jni/android_util_Process.cpp b/core/jni/android_util_Process.cpp index 43e0c34ab0f3..91dfc6023e42 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); } -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}, |