commit 0937e5bc5954e04ab0ed910b3af6bcaed51ceecc
author Phil Weaver <pweaver@google.com> Wed May 25 23:27:11 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 25 23:27:11 2016 +0000
tree 37c08d76d3917a3e1ed591cff367b0f7c09fd893
parent 8f8be84cd1df257e79da1f74d9375bff920a9d22
parent f057299a13393fab596caccc3b9ac21fb5ecd599

Merge "CTS coverage: connectivity change, photo, + video" into nyc-dev am: f057299a13
am: da9e8fae16

* commit 'da9e8fae16757694f21c9af55d7222518a2ea7ae':
  CTS coverage: connectivity change, photo, + video

Change-Id: I99cb61f27b0532b7b17be0e938fd7655b43b57f1

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,