commit cba166d38004482f04b1b406b0a4ec8933daea9d
author Rebecca Silberstein <silberst@google.com> Tue May 30 22:02:18 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 30 22:02:18 2017 +0000
tree bf526848dd05e64abf2f3c16e168c003c5e14cb5
parent 91df0c9a035c3ddc68667719736a7bd83f25e368
parent bbc260d4082dbde09059b577e569e002369eb243

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

Change-Id: Iec61f95ab0c0e77e280461f3142e6b878725cc7d

src/com/android/settings/widget/SettingsAppWidgetProvider.java

diff --git a/src/com/android/settings/widget/SettingsAppWidgetProvider.java b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
index 38fed94..7dacaf5 100644
--- a/src/com/android/settings/widget/SettingsAppWidgetProvider.java
+++ b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
@@ -395,7 +395,10 @@
                     int wifiApState = wifiManager.getWifiApState();
                     if (desiredState && ((wifiApState == WifiManager.WIFI_AP_STATE_ENABLING) ||
                                          (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);