Skip to content
Snippets Groups Projects
Commit 1f511393 authored by T.J. Mercier's avatar T.J. Mercier Committed by Automerger Merge Worker
Browse files

Merge "Reapply "Adapt to libprocessgroup API changes for polling on cgro...""...

Merge "Reapply "Adapt to libprocessgroup API changes for polling on cgro..."" into main am: d42e1434 am: 06f1e3f2

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



Change-Id: Ib515977fc6831a9ed74f1bd3d3958aac046a477d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 84cb697e 06f1e3f2
No related branches found
No related tags found
No related merge requests found
......@@ -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.
......
......@@ -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},
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment