commit bcc22abe3da75b1f25bbf038f200685753b229b5
author Lorenzo Colitti <lorenzo@google.com> Thu Mar 28 03:20:35 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Mar 28 03:20:35 2019 -0700
tree cabe32f46c31497457f2ad5f054b16bcd7286da0
parent ec3594edb14251ea11fc79a63d91dfd6c9c47371
parent 86effc29bac3e859c1299b9e483193218314f595

Merge "Fix expected reverse lookup of Google DNS IP addresses" am: 38ca09669a am: d73366ae68
am: 86effc29ba

Change-Id: Ia5b898185b77aceeb2e3a5fbdd168d3f470fa056

tests/cts/net/jni/NativeDnsJni.c

diff --git a/tests/cts/net/jni/NativeDnsJni.c b/tests/cts/net/jni/NativeDnsJni.c
index 352c0c5..6d3d1c3 100644
--- a/tests/cts/net/jni/NativeDnsJni.c
+++ b/tests/cts/net/jni/NativeDnsJni.c
@@ -120,8 +120,8 @@
             gai_strerror(res));
         return JNI_FALSE;
     }
-    if (strstr(buf, "google.com") == NULL) {
-        ALOGD("getnameinfo(%s (GoogleDNS) ) didn't return google.com: %s",
+    if (strstr(buf, "google.com") == NULL && strstr(buf, "dns.google") == NULL) {
+        ALOGD("getnameinfo(%s (GoogleDNS) ) didn't return google.com or dns.google: %s",
             GoogleDNSIpV4Address, buf);
         return JNI_FALSE;
     }
@@ -133,8 +133,9 @@
             res, gai_strerror(res));
         return JNI_FALSE;
     }
-    if (strstr(buf, "google.com") == NULL) {
-        ALOGD("getnameinfo(%s) didn't return google.com: %s", GoogleDNSIpV6Address2, buf);
+    if (strstr(buf, "google.com") == NULL && strstr(buf, "dns.google") == NULL) {
+        ALOGD("getnameinfo(%s (GoogleDNS) ) didn't return google.com or dns.google: %s",
+            GoogleDNSIpV6Address2, buf);
         return JNI_FALSE;
     }