Merge "Merge ab/6749736 in stage." into stage-aosp-master
This commit is contained in:
committed by
Android (Google) Code Review
commit
e9320762f1
@@ -95,12 +95,11 @@ static void android_net_utils_detachBPFFilter(JNIEnv *env, jobject clazz, jobjec
|
|||||||
{
|
{
|
||||||
int optval_ignored = 0;
|
int optval_ignored = 0;
|
||||||
int fd = jniGetFDFromFileDescriptor(env, javaFd);
|
int fd = jniGetFDFromFileDescriptor(env, javaFd);
|
||||||
if (setsockopt(
|
if (setsockopt(fd, SOL_SOCKET, SO_DETACH_FILTER, &optval_ignored, sizeof(optval_ignored)) !=
|
||||||
fd, SOL_SOCKET, SO_DETACH_FILTER, &optval_ignored, sizeof(optval_ignored)) != 0) {
|
0) {
|
||||||
jniThrowExceptionFmt(env, "java/net/SocketException",
|
jniThrowExceptionFmt(env, "java/net/SocketException",
|
||||||
"setsockopt(SO_DETACH_FILTER): %s", strerror(errno));
|
"setsockopt(SO_DETACH_FILTER): %s", strerror(errno));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static jboolean android_net_utils_bindProcessToNetwork(JNIEnv *env, jobject thiz, jint netId)
|
static jboolean android_net_utils_bindProcessToNetwork(JNIEnv *env, jobject thiz, jint netId)
|
||||||
|
|||||||
Reference in New Issue
Block a user