From 46c47eee5d6f557f8f1652051e5b8f0a6ed01020 Mon Sep 17 00:00:00 2001
From: Lorenzo Colitti <lorenzo@google.com>
Date: Wed, 27 Jan 2016 22:44:03 +0900
Subject: Unbreak the code that chooses the DHCP client.

https://partner-android-review.googlesource.com/#/c/516526/ broke
the code that chooses the DHCP client, by writing code that in
effect did:

if (setting) {
    use legacy DHCP client;
} else {
    use legacy DHCP client;
}

This means that both mm-wireless-dev and master are using the
legacy DHCP client all the time, which we did not use in M.

Change-Id: I9f5cee93262d001f9363b9c91840add1a8c9a4a6
---
 service/java/com/android/server/wifi/FrameworkFacade.java  |  7 ++++++-
 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);
         }
     }
 
-- 
cgit v1.2.3