diff options
| author | Xiao Ma <xiaom@google.com> | 2019-07-24 16:27:50 +0900 |
|---|---|---|
| committer | Xiao Ma <xiaom@google.com> | 2019-12-11 11:26:49 +0900 |
| commit | 859ceabd04daece392d42d37dbc2092cb88996f1 (patch) | |
| tree | 2a2adec6473fee85f7aff6971238eb58beaff56e /src/android/net/dhcp/DhcpClient.java | |
| parent | 762f239387423bf2250139f49972d2afa14c7428 (diff) | |
Add Rapid Commit option support in DHCP Server side.
Bug:136216415
Test: atest FrameworksNetTests NetworkStackTests
Test: atest NetworkStackIntegrationTests
Test: manual tethering
Change-Id: I0f9483c72374bab271eb18549a1a41812f32f2dd
Diffstat (limited to 'src/android/net/dhcp/DhcpClient.java')
| -rw-r--r-- | src/android/net/dhcp/DhcpClient.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/android/net/dhcp/DhcpClient.java b/src/android/net/dhcp/DhcpClient.java index e7d53ee..dc0175e 100644 --- a/src/android/net/dhcp/DhcpClient.java +++ b/src/android/net/dhcp/DhcpClient.java @@ -1171,7 +1171,8 @@ public class DhcpClient extends StateMachine { final DhcpResults results = packet.toDhcpResults(); if (results != null) { confirmDhcpLease(packet, results); - transitionTo(mConfiguringInterfaceState); + transitionTo(isDhcpIpConflictDetectEnabled() + ? mIpAddressConflictDetectingState : mConfiguringInterfaceState); } } } |