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

Merge "Improve handling of invalid private DNS settings"

Browse Source
This commit is contained in:
Treehugger Robot
2021-06-09 10:52:14 +00:00
committed by Gerrit Code Review
parent 545f6cf95f c2303139ef
commit b80e88d604
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java
View File

@@ -529,12 +529,14 @@ public final class CtsNetUtils {
} }
// restore private DNS setting // restore private DNS setting
if (PRIVATE_DNS_MODE_STRICT.equals(mOldPrivateDnsMode)) { if (PRIVATE_DNS_MODE_STRICT.equals(mOldPrivateDnsMode)) {
setPrivateDnsStrictMode(mOldPrivateDnsSpecifier); // In case of invalid setting, set to opportunistic to avoid a bad state and fail
// In case of invalid setting, still restore it but fail the test
if (mOldPrivateDnsSpecifier == null) { if (mOldPrivateDnsSpecifier == null) {
Settings.Global.putString(mCR, Settings.Global.PRIVATE_DNS_MODE,
PRIVATE_DNS_MODE_OPPORTUNISTIC);
fail("Invalid private DNS setting: no hostname specified in strict mode"); fail("Invalid private DNS setting: no hostname specified in strict mode");
} }
setPrivateDnsStrictMode(mOldPrivateDnsSpecifier);
awaitPrivateDnsSetting("restorePrivateDnsSetting timeout", awaitPrivateDnsSetting("restorePrivateDnsSetting timeout",
mCm.getActiveNetwork(), mCm.getActiveNetwork(),
mOldPrivateDnsSpecifier, true); mOldPrivateDnsSpecifier, true);