From 9d251279ca1ce905e332945e19fd0d3fc09103b1 Mon Sep 17 00:00:00 2001
From: Christopher Wiley <wiley@google.com>
Date: Mon, 18 Jul 2016 11:16:15 -0700
Subject: [PATCH] Do not use TetherUtil.setWifiTethering

This functionality is replaced by ConnectivityManager.startTethering()
and ConnectivityManager.stopTethering().

Bug: 30147602
Test: Can toggle tethering on/off via all of settings, quick settings,
      and quick quick settings.
Change-Id: I4d190185c473237982b988f898e76d4997dc401c
---
 src/com/android/settings/TetherService.java            |  4 +++-
 .../dashboard/conditional/HotspotCondition.java        |  5 ++++-
 src/com/android/settings/wifi/WifiApEnabler.java       | 10 ----------
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/com/android/settings/TetherService.java b/src/com/android/settings/TetherService.java
index 9176d445f37..ad0e41f44b9 100644
--- a/src/com/android/settings/TetherService.java
+++ b/src/com/android/settings/TetherService.java
@@ -199,7 +199,9 @@ public class TetherService extends Service {
     }
 
     private void disableWifiTethering() {
-        TetherUtil.setWifiTethering(false, this);
+        ConnectivityManager cm =
+                (ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);
+        cm.stopTethering(ConnectivityManager.TETHERING_WIFI);
     }
 
     private void disableUsbTethering() {
diff --git a/src/com/android/settings/dashboard/conditional/HotspotCondition.java b/src/com/android/settings/dashboard/conditional/HotspotCondition.java
index 17be591e6af..e440389127a 100644
--- a/src/com/android/settings/dashboard/conditional/HotspotCondition.java
+++ b/src/com/android/settings/dashboard/conditional/HotspotCondition.java
@@ -19,6 +19,7 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Icon;
+import android.net.ConnectivityManager;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
 import android.os.UserHandle;
@@ -102,7 +103,9 @@ public class HotspotCondition extends Condition {
             if (admin != null) {
                 RestrictedLockUtils.sendShowAdminSupportDetailsIntent(context, admin);
             } else {
-                TetherUtil.setWifiTethering(false, context);
+                ConnectivityManager cm = (ConnectivityManager) context.getSystemService(
+                        Context.CONNECTIVITY_SERVICE);
+                cm.stopTethering(ConnectivityManager.TETHERING_WIFI);
                 setActive(false);
             }
         } else {
diff --git a/src/com/android/settings/wifi/WifiApEnabler.java b/src/com/android/settings/wifi/WifiApEnabler.java
index 8cfd0492c99..760879e5d8e 100644
--- a/src/com/android/settings/wifi/WifiApEnabler.java
+++ b/src/com/android/settings/wifi/WifiApEnabler.java
@@ -110,16 +110,6 @@ public class WifiApEnabler {
         }
     }
 
-    public void setSoftapEnabled(boolean enable) {
-        if (TetherUtil.setWifiTethering(enable, mContext)) {
-            /* Disable here, enabled on receiving success broadcast */
-            mSwitch.setEnabled(false);
-        } else {
-            mSwitch.setSummary(R.string.wifi_error);
-        }
-
-    }
-
     public void updateConfigSummary(WifiConfiguration wifiConfig) {
         String s = mContext.getString(
                 com.android.internal.R.string.wifi_tether_configure_ssid_default);