LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354 am: d4831efbe0 am: 88a48fcbfe am: 9c3250f49c am: 761b3e5e7b am: e7ee057428

Browse Source 
am: bc9edb5254

Change-Id: Ia747dca9285940109dc2aebbfde4d1f184c020cd
This commit is contained in:
Lorenzo Colitti
2019-04-08 17:10:16 -07:00
committed by android-build-merger
parent 8619176b0c bc9edb5254
commit 296cfbb29c
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/cts/net/jni/NativeDnsJni.c
View File

@@ -120,8 +120,8 @@ JNIEXPORT jboolean Java_android_net_cts_DnsTest_testNativeDns(JNIEnv* env, jclas
gai_strerror(res)); gai_strerror(res));
return JNI_FALSE; return JNI_FALSE;
} }
if (strstr(buf, "google.com") == NULL) { if (strstr(buf, "google.com") == NULL && strstr(buf, "dns.google") == NULL) {
ALOGD("getnameinfo(%s (GoogleDNS) ) didn't return google.com: %s", ALOGD("getnameinfo(%s (GoogleDNS) ) didn't return google.com or dns.google: %s",
GoogleDNSIpV4Address, buf); GoogleDNSIpV4Address, buf);
return JNI_FALSE; return JNI_FALSE;
} }
@@ -133,8 +133,9 @@ JNIEXPORT jboolean Java_android_net_cts_DnsTest_testNativeDns(JNIEnv* env, jclas
res, gai_strerror(res)); res, gai_strerror(res));
return JNI_FALSE; return JNI_FALSE;
} }
if (strstr(buf, "google.com") == NULL) { if (strstr(buf, "google.com") == NULL && strstr(buf, "dns.google") == NULL) {
ALOGD("getnameinfo(%s) didn't return google.com: %s", GoogleDNSIpV6Address2, buf); ALOGD("getnameinfo(%s (GoogleDNS) ) didn't return google.com or dns.google: %s",
GoogleDNSIpV6Address2, buf);
return JNI_FALSE; return JNI_FALSE;
} }