commit b8b3247eec1e9d1117c80d84dcf47df06401e2aa
author Felipe Leme <felipeal@google.com> Wed May 25 17:03:46 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 25 17:03:46 2016 +0000
tree d71746970e27ded1988544307a244b0dd23cd8a0
parent 1b302781d3c9e1be01997ef01d475a5f9e1a512c
parent b853005f3ce50c6a51963cff2e6627d55c6012b0

Merge "Use ConnectionManager API to check if network is metered." into nyc-dev am: b853005f3c
am: 0ce15caf77

* commit '0ce15caf77691d6a8d209a918ace9fa96bcfc0cf':
  Use ConnectionManager API to check if network is metered.

Change-Id: I6bbe0d03a8725017f756fa5fb49d338c7e8e0893

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,