commit 231acbca1b289c12ae6110c4dea35e0b50238a4d
author Chiachang Wang <chiachangwang@google.com> Tue Oct 13 09:29:47 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Oct 13 09:29:47 2020 +0000
tree 9e25e21c8f178f8b1552da6f19689f4344954003
parent 009ac78c7bd234b426650169ec1e2fefb3d78dda
parent 3da3af2a10ee72e64a6fae0bb018cf916d9ed4f9

Merge "Use system api for shell command handling" am: 3da3af2a10

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

Change-Id: I322bbe2f711f8c50efe9d50056787c0e60051fbb

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)