commit 774ed8f2768642c792c0628ba63a0fe30280ee90
author Owain Davies <otjdavies@google.com> Mon Apr 25 23:50:59 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Apr 25 23:50:59 2016 +0000
tree f9a169662b1411fab12a9535ff0f097734475e3b
parent 6ed611d7823d22330b539761cd3d844a0bd577fd
parent c403c812184518d391cfc8a986fd304d640e2fb3

Merge "Merge "Add assertion message if testDns ipv6 lookup reutrns ipv4." into lollipop-mr1-cts-dev am: b996de8" into marshmallow-cts-dev am: 48216c2 am: 275a0e6 am: 4be27c8 am: 0399523 am: fd3f832
am: c403c81

* commit 'c403c812184518d391cfc8a986fd304d640e2fb3':
  Add assertion message if testDns ipv6 lookup reutrns ipv4.

Change-Id: Idaf9c0536bd63cbaf5e109508e50c6a5d1808ac0

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,