From deca11c87dbe4d49b43961f6b755f4484936e2ca Mon Sep 17 00:00:00 2001
From: Rebecca Silberstein <silberst@google.com>
Date: Thu, 25 May 2017 02:50:29 -0700
Subject: [PATCH] SettingsAppWidgetProvider: do not use setWifiApEnabled

Calls to stop tethering should use stopTethering instead of
setWifiApEnabled.

Bug: 38017909
Test: manual
Change-Id: Ib43f8c29b190ba7bad9c5b2d6a01bc9558110890
---
 src/com/android/settings/widget/SettingsAppWidgetProvider.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/widget/SettingsAppWidgetProvider.java b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
index 38fed94a67..7dacaf5f2a 100644
--- a/src/com/android/settings/widget/SettingsAppWidgetProvider.java
+++ b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
@@ -395,7 +395,10 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider {
                     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);
-- 
2.11.0