Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use ConnectivityService's NETWORK_STACK permission for SoftAp operations"

Browse Source
This commit is contained in:
Erik Kline
2017-04-29 07:33:34 +00:00
committed by Gerrit Code Review
parent 4f8a375958 256be78f7d
commit 169681db26
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/core/java/com/android/server/connectivity/Tethering.java
View File

@@ -413,15 +413,21 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering
}
private int setWifiTethering(final boolean enable) {
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;
int rval = ConnectivityManager.TETHER_ERROR_MASTER_ERROR;
final long ident = Binder.clearCallingIdentity();
try {
synchronized (mPublicSync) {
mWifiTetherRequested = enable;
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) {