Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove wifi enabled checking from settings TetherUtil

Browse Source 
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
This commit is contained in:
Mitchell Wills
2015-08-11 17:59:45 -07:00
parent a8f68d2da7
commit 8ba94ba2ab
1 changed files with 1 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
packages/SettingsLib/src/com/android/settingslib/TetherUtil.java
View File

@@ -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) {