diff options
author | Jaewan Kim <jaewan@google.com> | 2014-04-07 08:59:27 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-07 08:59:27 +0000 |
commit | ac6a3c3cb35e1b7ebd7300fa47f0f97a6d4d7e85 (patch) | |
tree | a909ad96c744fa2ab66791f99daf5be50e536bab | |
parent | 1af4788f06bd049e7d3e8834bf12bf42ac4795a9 (diff) | |
parent | 34dcbefe5c991ab93c3dbbf3ac4530ef727bddec (diff) | |
download | packages_apps_Settings-ac6a3c3cb35e1b7ebd7300fa47f0f97a6d4d7e85.zip packages_apps_Settings-ac6a3c3cb35e1b7ebd7300fa47f0f97a6d4d7e85.tar.gz packages_apps_Settings-ac6a3c3cb35e1b7ebd7300fa47f0f97a6d4d7e85.tar.bz2 |
Merge "Revert "Refactor IpConfiguration from WifiConfiguration""
-rw-r--r-- | src/com/android/settings/wifi/WifiConfigController.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java index e2826c3..8dc5c91 100644 --- a/src/com/android/settings/wifi/WifiConfigController.java +++ b/src/com/android/settings/wifi/WifiConfigController.java @@ -20,8 +20,6 @@ import static android.net.wifi.WifiConfiguration.INVALID_NETWORK_ID; import android.content.Context; import android.content.res.Resources; -import android.net.IpConfiguration.IpAssignment; -import android.net.IpConfiguration.ProxySettings; import android.net.LinkAddress; import android.net.LinkProperties; import android.net.NetworkInfo.DetailedState; @@ -30,7 +28,9 @@ import android.net.ProxyProperties; import android.net.RouteInfo; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiConfiguration.AuthAlgorithm; +import android.net.wifi.WifiConfiguration.IpAssignment; import android.net.wifi.WifiConfiguration.KeyMgmt; +import android.net.wifi.WifiConfiguration.ProxySettings; import android.net.wifi.WifiEnterpriseConfig; import android.net.wifi.WifiEnterpriseConfig.Eap; import android.net.wifi.WifiEnterpriseConfig.Phase2; @@ -40,8 +40,8 @@ import android.security.Credentials; import android.security.KeyStore; import android.text.Editable; import android.text.InputType; -import android.text.TextUtils; import android.text.TextWatcher; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.view.ViewGroup; |