commit eaf3745bc8c6b8294c39452aac1f7da4829e597c
author Marcus Nascimento <marcusn@google.com> Fri Apr 29 11:20:20 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 29 11:20:20 2016 +0000
tree 54ef6382d9ea2d6f435d6ca3b636a7ec8a6cef00
parent 733eb43443459891816f50f3b3beb339f678f80e
parent c847a249c635808e41972f5ad123853c7c556c62

Merge "Merge "Add assertion message to assertions for testExecute_withMobile." into lollipop-mr1-cts-dev am: ce158e65ae  -s ours" into marshmallow-cts-dev am: 90419fc992 am: 4699aa522a am: 69db501b63 am: f9185c256f am: 8ad4295bec
am: c847a249c6

* commit 'c847a249c635808e41972f5ad123853c7c556c62':
  Add assertion message to assertions for testExecute_withMobile.

Change-Id: I6eb9291f36ec7f72879743e9b475eaf2186d3544

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,