commit 141e442e2685da8efb6d7e73c47bdb09804fbe28
author Rebecca Silberstein <silberst@google.com> Tue May 30 22:11:21 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 30 22:11:21 2017 +0000
tree c5f8b9a4af60c235e6f178ad76892219e84d8a8e
parent 56f3c8eb3d56d6d7acff2103aba258eb9480c1e1
parent cba166d38004482f04b1b406b0a4ec8933daea9d

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

Change-Id: Ie639b844ab810386e8f0203e2978bf07453e35bd

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);