commit 2be0c9dfc09a7e24b3a7e2dee7b19df799821887
author Benedict Wong <benedictwong@google.com> Fri Sep 25 18:51:19 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Sep 25 18:51:19 2020 +0000
tree 37ed0759b5af2d5e86f59a2634901c970b801e30
parent 709c3865247368985126b566a7f84c15d167d3ca
parent 00a8a719cf9fe0e49d8994d06e3f64de7b2d76c8

Merge "Provide more feedback to Settings when sessions fail" am: 6194869dfb am: 00a8a719cf

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

Change-Id: Ifd27daeac7a9852fe1f00fbbdcf3c60faf385ce4

core/jni/android_net_NetUtils.cpp

diff --git a/core/jni/android_net_NetUtils.cpp b/core/jni/android_net_NetUtils.cpp
index 7d6135b..8d4c4e5 100644
--- a/core/jni/android_net_NetUtils.cpp
+++ b/core/jni/android_net_NetUtils.cpp
@@ -95,12 +95,11 @@
 {
     int optval_ignored = 0;
     int fd = jniGetFDFromFileDescriptor(env, javaFd);
-    if (setsockopt(
-            fd, SOL_SOCKET, SO_DETACH_FILTER, &optval_ignored, sizeof(optval_ignored)) != 0) {
+    if (setsockopt(fd, SOL_SOCKET, SO_DETACH_FILTER, &optval_ignored, sizeof(optval_ignored)) !=
+        0) {
         jniThrowExceptionFmt(env, "java/net/SocketException",
                 "setsockopt(SO_DETACH_FILTER): %s", strerror(errno));
     }
-
 }
 
 static jboolean android_net_utils_bindProcessToNetwork(JNIEnv *env, jobject thiz, jint netId)