commit 6829652e87b94002b19c482976c5928abff793da
author Marcus Nascimento <marcusn@google.com> Thu May 19 18:26:21 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 19 18:26:21 2016 +0000
tree d63ad26cd2780f8840c4e2847538d827c74e7a72
parent 999a4fef2d3e08d077e230cff7f042e40477696d
parent b232cf2d49c66291e203d63b05cc0921170f42c2

Merge "Merge "Add assertion messages to testStartUsingNetworkFeature_enableHipri." into lollipop-mr1-cts-dev am: 92849de21f  -s ours" into marshmallow-cts-dev am: a6aa5bce79 am: 9ef251d523 am: 1ad52d8800 am: 01c938ccb7 am: 64f19d0319
am: b232cf2d49

* commit 'b232cf2d49c66291e203d63b05cc0921170f42c2':
  Add assertion messages to testStartUsingNetworkFeature_enableHipri.

Change-Id: I48999b9bc410228a67a52f4fedf85e613b2d3ebf

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,