PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge \"Do not use TetherUtil.setWifiTethering\" into nyc-mr1-dev

Browse Source 
am: 62edbf484e

Change-Id: I023592acc146cbddb2917556a0fb7c3dade417f4
This commit is contained in:
Christopher Wiley
2016-07-19 16:02:42 +00:00
committed by android-build-merger
parent 44c13b223f 62edbf484e
commit 9170100f6c
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/dashboard/conditional/HotspotCondition.java
View File

@@ -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 {