drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 81433a38: Merge "Temp disable Tethering if DUN is required" into ics-mr0

Browse Source 
* commit '81433a38784e64dbc155047a3915cf5eff32840b':
  Temp disable Tethering if DUN is required
This commit is contained in:
Robert Greenwalt
2011-10-28 02:13:59 +00:00
committed by Android Git Automerger
parent 1b15f7f1ab 81433a3878
commit 859bf0f2ef
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/java/com/android/server/ConnectivityService.java
View File

@ -2450,6 +2450,12 @@ public class ConnectivityService extends IConnectivityManager.Stub {
int defaultVal = (SystemProperties.get("ro.tether.denied").equals("true") ? 0 : 1); int defaultVal = (SystemProperties.get("ro.tether.denied").equals("true") ? 0 : 1);
boolean tetherEnabledInSettings = (Settings.Secure.getInt(mContext.getContentResolver(), boolean tetherEnabledInSettings = (Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.TETHER_SUPPORTED, defaultVal) != 0); Settings.Secure.TETHER_SUPPORTED, defaultVal) != 0);
// Short term disabling of Tethering if DUN is required.
// TODO - fix multi-connection tethering using policy-base routing
int[] upstreamConnTypes = mTethering.getUpstreamIfaceTypes();
for (int i : upstreamConnTypes) {
if (i == ConnectivityManager.TYPE_MOBILE_DUN) return false;
}
return tetherEnabledInSettings && mTetheringConfigValid; return tetherEnabledInSettings && mTetheringConfigValid;
} }