Merge "SettingsAppWidgetProvider: do not use setWifiApEnabled" into oc-dev

This commit is contained in:
Rebecca Silberstein
2017-05-30 21:48:36 +00:00
committed by Android (Google) Code Review

View File

@@ -395,7 +395,10 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider {
int wifiApState = wifiManager.getWifiApState(); int wifiApState = wifiManager.getWifiApState();
if (desiredState && ((wifiApState == WifiManager.WIFI_AP_STATE_ENABLING) || if (desiredState && ((wifiApState == WifiManager.WIFI_AP_STATE_ENABLING) ||
(wifiApState == WifiManager.WIFI_AP_STATE_ENABLED))) { (wifiApState == WifiManager.WIFI_AP_STATE_ENABLED))) {
wifiManager.setWifiApEnabled(null, false); final ConnectivityManager connectivityManager =
(ConnectivityManager) context.getSystemService(
Context.CONNECTIVITY_SERVICE);
connectivityManager.stopTethering(ConnectivityManager.TETHERING_WIFI);
} }
wifiManager.setWifiEnabled(desiredState); wifiManager.setWifiEnabled(desiredState);