commit 43829099b13b1e7725dd2089e0a2a80b92156b3d
author Felipe Leme <felipeal@google.com> Fri May 06 17:45:54 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri May 06 17:45:54 2016 +0000
tree 2d303aeaae085bdc6a1acf9803c7796a72325a3c
parent 707b549b422428852d381611fc7afb5e74a5514a
parent aa2e8ea1d8b62ea6b6ffd3a507f7f3b797a33c1e

Merge "Assert whitelists are revoked on uninstall." into nyc-dev am: cd8e99563b
am: c180707aa4

* commit 'c180707aa4ca9a14f38c118103d003cbe0624ae2':
  Assert whitelists are revoked on uninstall.

Change-Id: I624660ebae235bd8cf5c5b80d471237bbc3db818

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,