commit 3c4526d753e6ad0479a370c42fc12214a0d385b4
author Felipe Leme <felipeal@google.com> Wed May 25 17:00:54 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 25 17:00:54 2016 +0000
tree d71746970e27ded1988544307a244b0dd23cd8a0
parent 45af342981e837e5ea2458b6f8ea5451a301e145
parent b853005f3ce50c6a51963cff2e6627d55c6012b0

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

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

Change-Id: I5f092fcc9b2220af3c033d84271c29e641027e4e

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,