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

Merge "Move to renamed NDK symbol AFileDescriptor_getFd"

Browse Source
This commit is contained in:
Orion Hodson
2021-05-21 08:29:52 +00:00
committed by Gerrit Code Review
parent d4a99869a8 53c562b5f6
commit 94deae9295
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/com_android_internal_net_NetworkUtilsInternal.cpp
View File

@@ -31,7 +31,7 @@ static jboolean android_net_utils_protectFromVpn(JNIEnv *env, jobject thiz, jint
} }
static jboolean android_net_utils_protectFromVpnWithFd(JNIEnv *env, jobject thiz, jobject javaFd) { static jboolean android_net_utils_protectFromVpnWithFd(JNIEnv *env, jobject thiz, jobject javaFd) {
return android_net_utils_protectFromVpn(env, thiz, AFileDescriptor_getFD(env, javaFd)); return android_net_utils_protectFromVpn(env, thiz, AFileDescriptor_getFd(env, javaFd));
} }
static const JNINativeMethod gNetworkUtilMethods[] = { static const JNINativeMethod gNetworkUtilMethods[] = {

12
packages/Connectivity/framework/jni/android_net_NetworkUtils.cpp
View File

@@ -76,7 +76,7 @@ static void android_net_utils_attachDropAllBPFFilter(JNIEnv *env, jobject clazz,
filter_code, filter_code,
}; };
int fd = AFileDescriptor_getFD(env, javaFd); int fd = AFileDescriptor_getFd(env, javaFd);
if (setsockopt(fd, SOL_SOCKET, SO_ATTACH_FILTER, &filter, sizeof(filter)) != 0) { if (setsockopt(fd, SOL_SOCKET, SO_ATTACH_FILTER, &filter, sizeof(filter)) != 0) {
jniThrowExceptionFmt(env, "java/net/SocketException", jniThrowExceptionFmt(env, "java/net/SocketException",
"setsockopt(SO_ATTACH_FILTER): %s", strerror(errno)); "setsockopt(SO_ATTACH_FILTER): %s", strerror(errno));
@@ -86,7 +86,7 @@ static void android_net_utils_attachDropAllBPFFilter(JNIEnv *env, jobject clazz,
static void android_net_utils_detachBPFFilter(JNIEnv *env, jobject clazz, jobject javaFd) static void android_net_utils_detachBPFFilter(JNIEnv *env, jobject clazz, jobject javaFd)
{ {
int optval_ignored = 0; int optval_ignored = 0;
int fd = AFileDescriptor_getFD(env, javaFd); int fd = AFileDescriptor_getFd(env, javaFd);
if (setsockopt(fd, SOL_SOCKET, SO_DETACH_FILTER, &optval_ignored, sizeof(optval_ignored)) != if (setsockopt(fd, SOL_SOCKET, SO_DETACH_FILTER, &optval_ignored, sizeof(optval_ignored)) !=
0) { 0) {
jniThrowExceptionFmt(env, "java/net/SocketException", jniThrowExceptionFmt(env, "java/net/SocketException",
@@ -112,7 +112,7 @@ static jboolean android_net_utils_bindProcessToNetworkForHostResolution(JNIEnv *
static jint android_net_utils_bindSocketToNetwork(JNIEnv *env, jobject thiz, jobject javaFd, static jint android_net_utils_bindSocketToNetwork(JNIEnv *env, jobject thiz, jobject javaFd,
jint netId) { jint netId) {
return setNetworkForSocket(netId, AFileDescriptor_getFD(env, javaFd)); return setNetworkForSocket(netId, AFileDescriptor_getFd(env, javaFd));
} }
static bool checkLenAndCopy(JNIEnv* env, const jbyteArray& addr, int len, void* dst) static bool checkLenAndCopy(JNIEnv* env, const jbyteArray& addr, int len, void* dst)
@@ -160,7 +160,7 @@ static jobject android_net_utils_resNetworkSend(JNIEnv *env, jobject thiz, jint
} }
static jobject android_net_utils_resNetworkResult(JNIEnv *env, jobject thiz, jobject javaFd) { static jobject android_net_utils_resNetworkResult(JNIEnv *env, jobject thiz, jobject javaFd) {
int fd = AFileDescriptor_getFD(env, javaFd); int fd = AFileDescriptor_getFd(env, javaFd);
int rcode; int rcode;
std::vector<uint8_t> buf(MAXPACKETSIZE, 0); std::vector<uint8_t> buf(MAXPACKETSIZE, 0);
@@ -187,7 +187,7 @@ static jobject android_net_utils_resNetworkResult(JNIEnv *env, jobject thiz, job
} }
static void android_net_utils_resNetworkCancel(JNIEnv *env, jobject thiz, jobject javaFd) { static void android_net_utils_resNetworkCancel(JNIEnv *env, jobject thiz, jobject javaFd) {
int fd = AFileDescriptor_getFD(env, javaFd); int fd = AFileDescriptor_getFd(env, javaFd);
resNetworkCancel(fd); resNetworkCancel(fd);
jniSetFileDescriptorOfFD(env, javaFd, -1); jniSetFileDescriptorOfFD(env, javaFd, -1);
} }
@@ -213,7 +213,7 @@ static jobject android_net_utils_getTcpRepairWindow(JNIEnv *env, jobject thiz, j
return NULL; return NULL;
} }
int fd = AFileDescriptor_getFD(env, javaFd); int fd = AFileDescriptor_getFd(env, javaFd);
struct tcp_repair_window trw = {}; struct tcp_repair_window trw = {};
socklen_t size = sizeof(trw); socklen_t size = sizeof(trw);