Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87e59d0e authored by Christopher Wiley's avatar Christopher Wiley Committed by Mitchell Wills
Browse files

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

(cherry picked from commit 9d251279)
parent 717d9f20

src/com/android/settings/TetherService.java

+3 −1
Original line number Diff line number Diff line
@@ -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() {

src/com/android/settings/dashboard/conditional/HotspotCondition.java

+4 −1
Original line number Diff line number Diff line
@@ -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 {

src/com/android/settings/wifi/WifiApEnabler.java

+0 −10
Original line number Diff line number Diff line
@@ -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);