Merge ab/6749736 in stage.

Bug: 167233921
Merged-In: Iecef31f7bf10ad97b7e0075cf302ae94e248474a
Change-Id: I9e9c873bc2e05a0cfe3af0bf74725500f3f108db
This commit is contained in:
Xin Li
2020-10-09 11:14:30 -07:00

View File

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