diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2020-06-18 07:59:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-18 07:59:52 +0000 |
| commit | 628ae8fc41aa1428fe4f99ea0b0491877fa30d27 (patch) | |
| tree | fc41f9ea08c91afac9ef7e2da1fa04146f22469e /src/android/net/ip/IpClient.java | |
| parent | fecc0bfbd60c4399a7a6e6ee6bd0e3d7f98a47cd (diff) | |
| parent | cb04ddcfdcd41af5e5d5eca26090e9e9ce971046 (diff) | |
Merge "Transition to appropriate state after all left addresses have been cleared." into rvc-dev am: fdbc41a222 am: cb04ddcfdc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11902482
Change-Id: I484c9996a4c683db193fba7785f2e62e5192ae64
Diffstat (limited to 'src/android/net/ip/IpClient.java')
| -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; |