commit 45af342981e837e5ea2458b6f8ea5451a301e145
author Lorenzo Colitti <lorenzo@google.com> Tue May 24 05:44:06 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 24 05:44:06 2016 +0000
tree 36ee0c4119f5e91a920b0d94ad3d84b333e202dd
parent 6829652e87b94002b19c482976c5928abff793da
parent 94636121f156c6b53a10b79f27d37c2a9c592f1c

Merge "Add a test for closing sockets when a VPN comes up." into nyc-dev
am: 94636121f1

* commit '94636121f156c6b53a10b79f27d37c2a9c592f1c':
  Add a test for closing sockets when a VPN comes up.

Change-Id: I0b23a38566afd96448a202d7a3b258d1960a53a3

tests/cts/net/jni/NativeDnsJni.c

diff --git a/tests/cts/net/jni/NativeDnsJni.c b/tests/cts/net/jni/NativeDnsJni.c
index 4eb3c7a..352c0c5 100644
--- a/tests/cts/net/jni/NativeDnsJni.c
+++ b/tests/cts/net/jni/NativeDnsJni.c
@@ -126,7 +126,7 @@
         return JNI_FALSE;
     }
 
-    memset(buf, sizeof(buf), 0);
+    memset(buf, 0, sizeof(buf));
     res = getnameinfo((const struct sockaddr*)&sa6, sizeof(sa6), buf, sizeof(buf), NULL, 0, flags);
     if (res != 0) {
         ALOGD("getnameinfo(%s (GoogleDNS) ) gave error %d (%s)", GoogleDNSIpV6Address2,