diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-06-18 05:11:11 +0000 |
---|---|---|
committer | Xiao Ma <xiaom@google.com> | 2020-06-18 05:50:46 +0000 |
commit | 2f103a71ae976320817765addc386b476be0c87a (patch) | |
tree | 1dffd29f6f2ab5ab7edcfd1f93bc18a485bc77e9 /src | |
parent | e213e2236fb567cbac73d92e501d428e598d9948 (diff) |
Transition to appropriate state after all left addresses have been cleared.
State machine will transit to RunningState directly after clearing all
left addresses even if the preconnection flag is enabled, that seems
incorrect to skip PreconnectingState. Rely on the preconnection flag
to determine which correct state should transit to.
Bug: 159109671
Test: atest NetworkStackIntegrationTests NetworkStackTests
Merged-In: I3d520a50f26ba7fac804c85c968013b2cb7cab91
Change-Id: I3d520a50f26ba7fac804c85c968013b2cb7cab91
Diffstat (limited to 'src')
-rw-r--r-- | src/android/net/ip/IpClient.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/android/net/ip/IpClient.java b/src/android/net/ip/IpClient.java index 28effd3..5d5b025 100644 --- a/src/android/net/ip/IpClient.java +++ b/src/android/net/ip/IpClient.java @@ -1772,7 +1772,7 @@ public class IpClient extends StateMachine { case EVENT_NETLINK_LINKPROPERTIES_CHANGED: handleLinkPropertiesUpdate(NO_CALLBACKS); if (readyToProceed()) { - transitionTo(mRunningState); + transitionTo(isUsingPreconnection() ? mPreconnectingState : mRunningState); } break; |