commit 19eb130f0216071bed8f193e939c11134bfd7eb8
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Aug 03 16:17:14 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Aug 03 16:17:14 2020 +0000
tree 256f06a5ebcb6e03153f3ee6e3d363b6e69ddfdd
parent 0f9b51cb0609c2081a7d33343446f6ebaa3793ba
parent fd5ab3e01bc8a229156de7e5cad09338b3c79d92

Merge "Update language to comply with Android's inclusive language guidance" into rvc-dev-plus-aosp am: fd5ab3e01b

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

Change-Id: I439c446bcd55b35ec41d7c4f76a53e39de5cdd4e

core/jni/android_net_NetUtils.cpp

diff --git a/core/jni/android_net_NetUtils.cpp b/core/jni/android_net_NetUtils.cpp
index e56809f..8d4c4e5 100644
--- a/core/jni/android_net_NetUtils.cpp
+++ b/core/jni/android_net_NetUtils.cpp
@@ -93,13 +93,13 @@
 
 static void android_net_utils_detachBPFFilter(JNIEnv *env, jobject clazz, jobject javaFd)
 {
-    int dummy = 0;
+    int optval_ignored = 0;
     int fd = jniGetFDFromFileDescriptor(env, javaFd);
-    if (setsockopt(fd, SOL_SOCKET, SO_DETACH_FILTER, &dummy, sizeof(dummy)) != 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)