Merge commit '87e59d0' into nyc-dev-plus-aosp (94473046) · Commits · e / os / android_packages_apps_Settings

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() {

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

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