From eabe05581ffabf64c8817e61d270032eddf6db94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Tue, 12 Jul 2022 05:23:38 +0000 Subject: [PATCH] noop - fix 'jobject -> jclass' in native jni code signature. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These are static methods, see: frameworks/base/core/java/com/android/internal/net/NetworkUtilsInternal.java public static native void setAllowNetworkingForProcess(boolean allowNetworking); public static native boolean protectFromVpn(FileDescriptor fd); public static native boolean protectFromVpn(int socketfd); Test: TreeHugger Signed-off-by: Maciej Żenczykowski Change-Id: Ibac6e7b864823cc94bb5301d47bf244b9dd6bdad --- .../jni/com_android_internal_net_NetworkUtilsInternal.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/jni/com_android_internal_net_NetworkUtilsInternal.cpp b/core/jni/com_android_internal_net_NetworkUtilsInternal.cpp index 83e2f2b3f89e2..22798563e8f54 100644 --- a/core/jni/com_android_internal_net_NetworkUtilsInternal.cpp +++ b/core/jni/com_android_internal_net_NetworkUtilsInternal.cpp @@ -21,17 +21,17 @@ #include "jni.h" namespace android { -static void android_net_utils_setAllowNetworkingForProcess(JNIEnv *env, jobject thiz, +static void android_net_utils_setAllowNetworkingForProcess(JNIEnv *env, jclass clazz, jboolean hasConnectivity) { setAllowNetworkingForProcess(hasConnectivity == JNI_TRUE); } -static jboolean android_net_utils_protectFromVpn(JNIEnv *env, jobject thiz, jint socket) { +static jboolean android_net_utils_protectFromVpn(JNIEnv *env, jclass clazz, jint socket) { return (jboolean)!protectFromVpn(socket); } -static jboolean android_net_utils_protectFromVpnWithFd(JNIEnv *env, jobject thiz, jobject javaFd) { - return android_net_utils_protectFromVpn(env, thiz, AFileDescriptor_getFd(env, javaFd)); +static jboolean android_net_utils_protectFromVpnWithFd(JNIEnv *env, jclass clazz, jobject javaFd) { + return android_net_utils_protectFromVpn(env, clazz, AFileDescriptor_getFd(env, javaFd)); } static const JNINativeMethod gNetworkUtilMethods[] = {