diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2016-01-28 00:22:57 +0000 |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2016-01-28 00:22:57 +0000 |
| commit | 65027c30caafb24f939dcc0eab716454c39bd6fe (patch) | |
| tree | 66e5c1394c2d090c909d8b7298fee626f18a781e | |
| parent | b8bf980e5827fb97d1b3ad5debcea74d5ad8db8b (diff) | |
| parent | 46c47eee5d6f557f8f1652051e5b8f0a6ed01020 (diff) | |
Merge "Unbreak the code that chooses the DHCP client." into mm-wireless-dev
| -rw-r--r-- | service/java/com/android/server/wifi/FrameworkFacade.java | 7 | ||||
| -rw-r--r-- | service/java/com/android/server/wifi/WifiStateMachine.java | 13 |
2 files changed, 8 insertions, 12 deletions
diff --git a/service/java/com/android/server/wifi/FrameworkFacade.java b/service/java/com/android/server/wifi/FrameworkFacade.java index 3ef2f5269..7be3f637e 100644 --- a/service/java/com/android/server/wifi/FrameworkFacade.java +++ b/service/java/com/android/server/wifi/FrameworkFacade.java @@ -7,6 +7,7 @@ import android.content.Intent; import android.net.BaseDhcpStateMachine; import android.net.DhcpStateMachine; import android.net.TrafficStats; +import android.net.dhcp.DhcpClient; import android.net.ip.IpReachabilityMonitor; import android.os.Handler; import android.os.IBinder; @@ -78,7 +79,11 @@ public class FrameworkFacade { public BaseDhcpStateMachine makeDhcpStateMachine( Context context, StateMachine controller, String intf) { - return DhcpStateMachine.makeDhcpStateMachine(context, controller, intf); + if (getIntegerSetting(context, Settings.Global.LEGACY_DHCP_CLIENT, 0) == 1) { + return DhcpStateMachine.makeDhcpStateMachine(context, controller, intf); + } else { + return DhcpClient.makeDhcpStateMachine(context, controller, intf); + } } public IpReachabilityMonitor makeIpReachabilityMonitor( diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index cc19e28de..dea10765b 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -4963,19 +4963,10 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno } - private boolean useLegacyDhcpClient() { - return mFacade.getIntegerSetting(mContext, Settings.Global.LEGACY_DHCP_CLIENT, 0) == 1; - } - private void maybeInitDhcpStateMachine() { if (mDhcpStateMachine == null) { - if (useLegacyDhcpClient()) { - mDhcpStateMachine = mFacade.makeDhcpStateMachine( - mContext, WifiStateMachine.this, mInterfaceName); - } else { - mDhcpStateMachine = mFacade.makeDhcpStateMachine( - mContext, WifiStateMachine.this, mInterfaceName); - } + mDhcpStateMachine = mFacade.makeDhcpStateMachine( + mContext, WifiStateMachine.this, mInterfaceName); } } |