summaryrefslogtreecommitdiff
path: root/src/android/net/ip/IpClient.java
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2020-06-18 07:35:50 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-18 07:35:50 +0000
commitfdbc41a2226a34d74211fde60147ea4f578d5d54 (patch)
tree7ee9295607a01cc07f8fc32836a713463cf86fa7 /src/android/net/ip/IpClient.java
parentf6d4760cd5df892ba146a2e761d2f9b977fdbf82 (diff)
parent2f103a71ae976320817765addc386b476be0c87a (diff)
Merge "Transition to appropriate state after all left addresses have been cleared." into rvc-dev
Diffstat (limited to 'src/android/net/ip/IpClient.java')
-rw-r--r--src/android/net/ip/IpClient.java2
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;