Merge "Use ConnectivityService's NETWORK_STACK permission for SoftAp operations" into oc-dev (d0e65f5e) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/connectivity/Tethering.java

+13 −7

Original line number	Diff line number	Diff line
		@@ -398,15 +398,21 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering
		}

		private int setWifiTethering(final boolean enable) {
		int rval = ConnectivityManager.TETHER_ERROR_MASTER_ERROR;
		final long ident = Binder.clearCallingIdentity();
		try {
		synchronized (mPublicSync) {
		mWifiTetherRequested = enable;
		final WifiManager wifiManager = getWifiManager();
		if ((enable && wifiManager.startSoftAp(null /* use existing wifi config */)) \|\|
		(!enable && wifiManager.stopSoftAp())) {
		return ConnectivityManager.TETHER_ERROR_NO_ERROR;
		final WifiManager mgr = getWifiManager();
		if ((enable && mgr.startSoftAp(null /* use existing wifi config */)) \|\|
		(!enable && mgr.stopSoftAp())) {
		rval = ConnectivityManager.TETHER_ERROR_NO_ERROR;
		}
		return ConnectivityManager.TETHER_ERROR_MASTER_ERROR;
		}
		} finally {
		Binder.restoreCallingIdentity(ident);
		}
		return rval;
		}

		private void setBluetoothTethering(final boolean enable, final ResultReceiver receiver) {