LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Temp disable Tethering if DUN is required

Browse Source 
Getting source-based routing working is too risk for this point
in the project but tethering is broken otherwise, so disable
the tethering option if DUN is required until we can get a real
fix in.

bug:5495862
Change-Id: I5e852bf30c887599024a8b61af86ffec1d5333af
This commit is contained in:
Robert Greenwalt
2011-10-27 14:50:27 -07:00
parent aac2c50385
commit 274518a279
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;
} }