diff options
| author | Chiachang Wang <chiachangwang@google.com> | 2019-05-28 09:44:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-28 09:44:47 +0000 |
| commit | face41674d7d0bff33c354a94e91aff559ff4d72 (patch) | |
| tree | 55aad105639c6de3bb8acfaeca2a2132ef731ffd /src | |
| parent | ac95b9f11a6576b09114f6585df2d01a7722f7f7 (diff) | |
| parent | 37fe18f9cb60a0bf8b3e34807a67bbaa552bf67b (diff) | |
Merge "Clean up for multiple validation result update" into qt-dev
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) { |