commit 6ed611d7823d22330b539761cd3d844a0bd577fd
author Owain Davies <otjdavies@google.com> Mon Apr 25 23:50:58 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Apr 25 23:50:58 2016 +0000
tree f01274b4196a751b9fff2603f4a0d13cd95ecd06
parent 595345b556dcb9bedbf5522a119700966ddb1131
parent 6d3841c6a577d23fc4be40b7b6cdd57074ebb589

Merge "Merge "Added assertion message to testDns failures" into lollipop-mr1-cts-dev am: 350b2aa" into marshmallow-cts-dev am: 936375b am: 2bfd0e1 am: 2a0f366 am: 39cb9a5 am: 7cde9a8
am: 6d3841c

* commit '6d3841c6a577d23fc4be40b7b6cdd57074ebb589':
  Added assertion message to testDns failures

Change-Id: Iefa78714f2819ba10668b2698903912472aed98a

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,