commit eacd0c167021935a2b3280c3ead7e4c6ced559a0
author Felipe Leme <felipeal@google.com> Thu Apr 14 20:08:15 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 14 20:08:15 2016 +0000
tree baca373cd5ee573fa14006899b7f54843bd54db2
parent c3b35400fb769de2acdf0cc1a46ac441753bd879
parent 0e47422a47489a8eea8fa7cd8b56ae94ac4f123c

Merge "Changed order of metered network check." into nyc-dev
am: 901854e

* commit '901854eb92bcc8b12d9aaf350210e72eb7585416':
  Changed order of metered network check.

Change-Id: Iad87c8f35e2a1aac56b9581e2c3f035dd02141e0

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,