Merge "Remove redundant network verification for as-is network" am: 12682c51c3 am: 87b30c2e78
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1962786
Change-Id: I7124cbd80d8429a185d17476aa18cebda1265397
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/server/connectivity/NetworkMonitor.java b/src/com/android/server/connectivity/NetworkMonitor.java
index fd566c8..2404542 100755
--- a/src/com/android/server/connectivity/NetworkMonitor.java
+++ b/src/com/android/server/connectivity/NetworkMonitor.java
@@ -1392,6 +1392,7 @@
// validation and private DNS validation.
validationLog("Captive portal is used as is, resolving private DNS");
transitionTo(mEvaluatingPrivateDnsState);
+ return HANDLED;
} else if (!isValidationRequired()) {
if (isPrivateDnsValidationRequired()) {
validationLog("Network would not satisfy default request, "
diff --git a/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java b/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java
index a963537..cec1777 100644
--- a/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java
+++ b/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java
@@ -2025,8 +2025,7 @@
// The network should still be valid.
verify(mCallbacks, timeout(HANDLER_TIMEOUT_MS).atLeastOnce())
.notifyNetworkTestedWithExtras(matchNetworkTestResultParcelable(
- NETWORK_VALIDATION_RESULT_VALID, 0 /* probesSucceeded */,
- TEST_LOGIN_URL));
+ NETWORK_VALIDATION_RESULT_VALID, 0 /* probesSucceeded */));
}
@Test