commit d1fb27d37f45d7ad979cba487e9db9281f9eed97
author Felipe Leme <felipeal@google.com> Wed May 04 20:06:53 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 04 20:06:53 2016 +0000
tree 90a95d2129a1a2fea03e7046e3b2fb1bd3ca220a
parent 00cf921893fcacc17f4f3aaa4d01816422599873
parent 691e85def733e6c8c3066c25448e51edad47f1dd

Merge "Temporarily disable NetworkInfo check." into nyc-dev
am: cdb30f18e4

* commit 'cdb30f18e44f14b32cfe76c572af22f82a816a00':
  Temporarily disable NetworkInfo check.

Change-Id: I2092f714c8db0b024e1ee9d5ba35e7a9a4023747

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,