diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-04-30 08:22:04 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-30 08:22:04 +0000 |
| commit | df1fcffeb6eb6db78a07edaaf1f8c3b60ac50d0f (patch) | |
| tree | c4b58d6a0a54971dcf64c88478c7b8e6f68e757c /src | |
| parent | 15de8ddc87d5d73cf80e576ecb759e9bef230b80 (diff) | |
| parent | 2e16ff33e97bdbf9f7a30807c740860a1b5f147e (diff) | |
Merge "Fix the potential double transition in DhcpState#enter" into rvc-dev am: 2e16ff33e9
Change-Id: Ib84f265fe9010b9065a1be5e290633381e06b03f
Diffstat (limited to 'src')
| -rw-r--r-- | src/android/net/dhcp/DhcpClient.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/android/net/dhcp/DhcpClient.java b/src/android/net/dhcp/DhcpClient.java index c13dc18..6d48c0c 100644 --- a/src/android/net/dhcp/DhcpClient.java +++ b/src/android/net/dhcp/DhcpClient.java @@ -959,7 +959,9 @@ public class DhcpClient extends StateMachine { Log.e(TAG, "Fail to start DHCP Packet Handler"); } notifyFailure(); - transitionTo(mStoppedState); + // We cannot call transitionTo because a transition is still in progress. + // Instead, ensure that we process CMD_STOP_DHCP as soon as the transition is complete. + deferMessage(obtainMessage(CMD_STOP_DHCP)); } @Override |