diff options
| author | Chiachang Wang <chiachangwang@google.com> | 2019-05-25 08:42:17 -0700 |
|---|---|---|
| committer | Chiachang Wang <chiachangwang@google.com> | 2019-05-27 00:54:53 +0000 |
| commit | 37fe18f9cb60a0bf8b3e34807a67bbaa552bf67b (patch) | |
| tree | 8860653d52ec6be0688df8d4cf947cb56ffc5079 /src | |
| parent | ae343fc3a7cda11c763c2a8f007a1495a462dd42 (diff) | |
Clean up for multiple validation result update
This is a follow-up commit for aosp/955431 to update commets
and minor updates in unit test.
Test: atest com.android.server.ConnectivityServiceTest#testCaptivePortalOnPartialConnectivity
Bug: 130683832
Change-Id: I581eae8daeddd2c4c186e7b40e27fef2aaa7ab43
Merged-In: I9087ef791b3fee5399ba8e83ef9d8a544845a4dd
Merged-In: I4424663292c5ad29eb7a888fa6975835721a5d2e
(cherry picked from commit 3d3a9fff7b7fa0df4ee627cb082668e642d6f754)
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/server/connectivity/NetworkMonitor.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/com/android/server/connectivity/NetworkMonitor.java b/src/com/android/server/connectivity/NetworkMonitor.java index 8090d14..4e40ba4 100644 --- a/src/com/android/server/connectivity/NetworkMonitor.java +++ b/src/com/android/server/connectivity/NetworkMonitor.java @@ -683,9 +683,9 @@ public class NetworkMonitor extends StateMachine { public void enter() { maybeLogEvaluationResult( networkEventType(validationStage(), EvaluationResult.VALIDATED)); - // If the user has accepted that and HTTPS probing is disabled, then mark the network - // as validated and partial so that settings can keep informing the user that the - // connection is limited. + // If the user has accepted partial connectivity and HTTPS probing is disabled, then + // mark the network as validated and partial so that settings can keep informing the + // user that the connection is limited. int result = NETWORK_VALIDATION_RESULT_VALID; if (!mUseHttps && mAcceptPartialConnectivity) { result |= NETWORK_VALIDATION_RESULT_PARTIAL; @@ -1054,6 +1054,11 @@ public class NetworkMonitor extends StateMachine { // TODO: Consider abandoning this state after a few attempts and // transitioning back to EvaluatingState, to perhaps give ourselves // the opportunity to (re)detect a captive portal or something. + // + // TODO: distinguish between CMD_EVALUATE_PRIVATE_DNS messages that are caused by server + // lookup failures (which should continue to do exponential backoff) and + // CMD_EVALUATE_PRIVATE_DNS messages that are caused by user reconfiguration (which + // should be processed immediately. sendMessageDelayed(CMD_EVALUATE_PRIVATE_DNS, mPrivateDnsReevalDelayMs); mPrivateDnsReevalDelayMs *= 2; if (mPrivateDnsReevalDelayMs > MAX_REEVALUATE_DELAY_MS) { |