commit 89b2f762ff28047bcde1cbf9ca1c18f366f58d12
author Lorenzo Colitti <lorenzo@google.com> Tue May 24 05:46:33 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 24 05:46:33 2016 +0000
tree 36ee0c4119f5e91a920b0d94ad3d84b333e202dd
parent 058420aaefc1f4288f3fe4da1e8d86fdb705262d
parent 94636121f156c6b53a10b79f27d37c2a9c592f1c

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

* commit '3cb83a57e728c35058ff030b8521ac299b3e3996':
  Add a test for closing sockets when a VPN comes up.

Change-Id: Ic2bcf6036f861ba6fa2a4f42f2109eb0ce26385a

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,