Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "noop - fix 'jobject -> jclass' in native jni code signature." am: 2fd53f29b2 am: 985fd4c619 am: cd38d035d8

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

Change-Id: Ibcb13f260d04c99f48fc2807d18033d78aa96e05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-07-12 20:24:26 +00:00
committed by Automerger Merge Worker
parent a45b7b41bd cd38d035d8
commit ab915589a8
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/jni/com_android_internal_net_NetworkUtilsInternal.cpp
View File

@@ -21,17 +21,17 @@
#include "jni.h" #include "jni.h"
namespace android { namespace android {
static void android_net_utils_setAllowNetworkingForProcess(JNIEnv *env, jobject thiz, static void android_net_utils_setAllowNetworkingForProcess(JNIEnv *env, jclass clazz,
jboolean hasConnectivity) { jboolean hasConnectivity) {
setAllowNetworkingForProcess(hasConnectivity == JNI_TRUE); 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); return (jboolean)!protectFromVpn(socket);
} }
static jboolean android_net_utils_protectFromVpnWithFd(JNIEnv *env, jobject thiz, jobject javaFd) { static jboolean android_net_utils_protectFromVpnWithFd(JNIEnv *env, jclass clazz, jobject javaFd) {
return android_net_utils_protectFromVpn(env, thiz, AFileDescriptor_getFd(env, javaFd)); return android_net_utils_protectFromVpn(env, clazz, AFileDescriptor_getFd(env, javaFd));
} }
static const JNINativeMethod gNetworkUtilMethods[] = { static const JNINativeMethod gNetworkUtilMethods[] = {