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

Merge "Remove wifi enabled checking from settings TetherUtil" into mnc-dr-dev

Browse Source
This commit is contained in:
Mitchell Wills
2015-08-20 16:58:02 +00:00
committed by Android (Google) Code Review
parent 2364af2083 8ba94ba2ab
commit b460cc8886
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) { public static boolean setWifiTethering(boolean enable, Context context) {
final WifiManager wifiManager = final WifiManager wifiManager =
(WifiManager) context.getSystemService(Context.WIFI_SERVICE); (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
final ContentResolver cr = context.getContentResolver(); return wifiManager.setWifiApEnabled(null, enable);
/**
* 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;
} }
public static boolean isWifiTetherEnabled(Context context) { public static boolean isWifiTetherEnabled(Context context) {