From 3d74004c6f60f37b06d5a4ba708a1a2879cec787 Mon Sep 17 00:00:00 2001 From: "T.J. Mercier" Date: Tue, 31 Oct 2023 16:33:40 +0000 Subject: Adapt to libprocessgroup API changes for polling on cgroup.events Bug: 301871933 Change-Id: Ib2ea4263d831c28b03ee0a27e2029207ec8af371 --- core/java/android/os/Process.java | 2 +- 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 18c60a793166..edb95dd04872 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}, -- cgit v1.2.3-59-g8ed1b