diff options
| author | Android Culprit Assistant <boq-android-culprit-assistant@system.gserviceaccount.com> | 2023-12-08 01:48:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-12-08 01:48:26 +0000 |
| commit | 4a11b111c17533d530e8e568073a9c20286a42bd (patch) | |
| tree | ac897f00fc200702c37fb01a0e49e2f889d03f6a | |
| parent | 3d74004c6f60f37b06d5a4ba708a1a2879cec787 (diff) | |
| download | base-4a11b111c17533d530e8e568073a9c20286a42bd.tar.gz | |
Revert "Adapt to libprocessgroup API changes for polling on cgro..."
This revert was created by Android Culprit Assistant. The culprit was identified in the following culprit search session (http://go/aca-get/91da3c52-9b76-498b-bdbd-a9de7d7ff53b).
Change-Id: Ib6098ab1fcfc29cd4f54d334816f31b7736254d5
| -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 9b77b798facf..04525e8b8ff7 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 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 edb95dd04872..18c60a793166 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}, |