commit 4d279942b48f4a3f5da9e163162110c89d187ad0
author Xin Li <delphij@google.com> Fri Sep 11 02:02:37 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Sep 11 02:02:37 2020 +0000
tree 84ec0e2f07f422708adcc8f552f6feac748c5f1f
parent 81ea02a2a5fa98afa7204ece73fe188e8536fdbe
parent a3e6d6bb64c2424a05de8ce76fd920961b6fccd1

[automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours

am skip reason: Change-Id Ice3e441cc9c0df8d0a6acc016bb74375e081bd67 with SHA-1 ec82033d3e is in history

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

Change-Id: Ie915db11679ce05f5d37815028015f61ffb1a4a6

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)