commit 00cf921893fcacc17f4f3aaa4d01816422599873
author Felipe Leme <felipeal@google.com> Wed May 04 00:59:59 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 04 00:59:59 2016 +0000
tree 0138b0971bd6a253131a76075cb3cbd8868b458f
parent 9d9ca5607943a7b86f8ebf2b801032d541236a9f
parent 50bce69fabb711b48ec7e4502cfa9115a31fc1e0

Merge "Improved connectivity check by also asserting NetworkInfo states." into nyc-dev
am: fe6dc2b966

* commit 'fe6dc2b966686da65dae3e0766e56bf25844500c':
  Improved connectivity check by also asserting NetworkInfo states.

Change-Id: Icba9139f192182fe6adaf03ef813dc20bd66f681

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,