joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Add build options for tethering.

Browse source 
Dun-required bool and list of allowed upstream ifaces.
This commit is contained in:
Robert Greenwalt 2010-02-25 12:29:30 -08:00
commit f1b66e1be1
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
services/java/com/android/server/ConnectivityService.java
View file

@ -66,6 +66,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
private Tethering mTethering;
private boolean mTetheringConfigValid = false;
/**
* Sometimes we want to refer to the individual network state
@ -320,6 +321,12 @@ public class ConnectivityService extends IConnectivityManager.Stub {
}
mTethering = new Tethering(mContext);
mTetheringConfigValid = (((mNetTrackers[ConnectivityManager.TYPE_MOBILE_DUN] != null) ||
!mTethering.isDunRequired()) &&
(mTethering.getTetherableUsbRegexs().length != 0 ||
mTethering.getTetherableWifiRegexs().length != 0) &&
mTethering.getUpstreamIfaceRegexs().length != 0);
}
@ -1498,8 +1505,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
public boolean isTetheringSupported() {
enforceTetherAccessPermission();
int defaultVal = (SystemProperties.get("ro.tether.denied").equals("true") ? 0 : 1);
return ((Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.TETHER_SUPPORTED, defaultVal) != 0) &&
(mNetTrackers[ConnectivityManager.TYPE_MOBILE_DUN] != null));
boolean tetherEnabledInSettings = (Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.TETHER_SUPPORTED, defaultVal) != 0);
return tetherEnabledInSettings && mTetheringConfigValid;
}
}