commit 676087c191fa935e4ed6b664477769c8b42c5e8d
author Felipe Leme <felipeal@google.com> Wed May 04 01:05:51 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 04 01:05:51 2016 +0000
tree 0138b0971bd6a253131a76075cb3cbd8868b458f
parent 4a8dbb8899d0bfca2b983767dcc6a77aa48f103e
parent 50bce69fabb711b48ec7e4502cfa9115a31fc1e0

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

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

Change-Id: I29f619e29a0a7f1519bdadaba72e24b85102be06

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,