From 8ba94ba2ab946e5fac35db2d3bccb6674d1989c6 Mon Sep 17 00:00:00 2001 From: Mitchell Wills Date: Tue, 11 Aug 2015 17:59:45 -0700 Subject: Remove wifi enabled checking from settings TetherUtil TetherUtil no longer needs to reenable wifi when leaving SAP mode as it is now done by WifiController. WifiController will also disable wifi if needed when enabling SAP. Bug: 22729316 Change-Id: I2ffe50e6468519ca964b27ba70a7e3019fd96eb1 --- .../src/com/android/settingslib/TetherUtil.java | 24 +--------------------- 1 file changed, 1 insertion(+), 23 deletions(-) (limited to 'packages/SettingsLib') diff --git a/packages/SettingsLib/src/com/android/settingslib/TetherUtil.java b/packages/SettingsLib/src/com/android/settingslib/TetherUtil.java index 58e5e29..5062423 100644 --- a/packages/SettingsLib/src/com/android/settingslib/TetherUtil.java +++ b/packages/SettingsLib/src/com/android/settingslib/TetherUtil.java @@ -54,29 +54,7 @@ public class TetherUtil { public static boolean setWifiTethering(boolean enable, Context context) { final WifiManager wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE); - final ContentResolver cr = context.getContentResolver(); - /** - * Disable Wifi if enabling tethering - */ - int wifiState = wifiManager.getWifiState(); - if (enable && ((wifiState == WifiManager.WIFI_STATE_ENABLING) || - (wifiState == WifiManager.WIFI_STATE_ENABLED))) { - wifiManager.setWifiEnabled(false); - Settings.Global.putInt(cr, Settings.Global.WIFI_SAVED_STATE, 1); - } - - boolean success = wifiManager.setWifiApEnabled(null, enable); - /** - * If needed, restore Wifi on tether disable - */ - if (!enable) { - int wifiSavedState = Settings.Global.getInt(cr, Settings.Global.WIFI_SAVED_STATE, 0); - if (wifiSavedState == 1) { - wifiManager.setWifiEnabled(true); - Settings.Global.putInt(cr, Settings.Global.WIFI_SAVED_STATE, 0); - } - } - return success; + return wifiManager.setWifiApEnabled(null, enable); } public static boolean isWifiTetherEnabled(Context context) { -- cgit v1.1