commit 10dd3d7a84d2e5604d9a7e256646c5ed682d0280
author Felipe Leme <felipeal@google.com> Fri May 06 23:17:12 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri May 06 23:17:12 2016 +0000
tree f63da4e5102d78bf93ea7ddf1df036133c709a71
parent 11cda18ea6bb5368bf766ca1841c52958541c633
parent 6cd41f6d03936d4c64cea805b347f691735c0d82

Merge "Asserts foreground apps always have network access." into nyc-dev
am: 68aeb4d914

* commit '68aeb4d9147942496beb2bf5fa78ae2428f15c82':
  Asserts foreground apps always have network access.

Change-Id: I32dd08add98d57c3feca224920d8028254102aab

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,