Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0b5f08e authored by Orion Hodson's avatar Orion Hodson Committed by Automerger Merge Worker
Browse files

Merge "Move to renamed NDK symbol AFileDescriptor_getFd" am: 94deae92 

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

Change-Id: Ia45703aa469fcfb1efcc6b12479254e731dc794b
parents 795eba2a 94deae92

core/jni/com_android_internal_net_NetworkUtilsInternal.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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) {

    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[] = {

packages/Connectivity/framework/jni/android_net_NetworkUtils.cpp

+6 −6
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static void android_net_utils_attachDropAllBPFFilter(JNIEnv *env, jobject clazz, 
        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) {

        jniThrowExceptionFmt(env, "java/net/SocketException",

                "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)

{

    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)) !=

        0) {

        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,

                                                  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)
@@ -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) {

    int fd = AFileDescriptor_getFD(env, javaFd);

    int fd = AFileDescriptor_getFd(env, javaFd);

    int rcode;

    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) {

    int fd = AFileDescriptor_getFD(env, javaFd);

    int fd = AFileDescriptor_getFd(env, javaFd);

    resNetworkCancel(fd);

    jniSetFileDescriptorOfFD(env, javaFd, -1);

}
@@ -213,7 +213,7 @@ static jobject android_net_utils_getTcpRepairWindow(JNIEnv *env, jobject thiz, j 
        return NULL;

    }



    int fd = AFileDescriptor_getFD(env, javaFd);

    int fd = AFileDescriptor_getFd(env, javaFd);

    struct tcp_repair_window trw = {};

    socklen_t size = sizeof(trw);