summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/java/com/android/server/ConnectivityService.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index 498bdfcb6085..851cb3360476 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -2450,6 +2450,12 @@ public class ConnectivityService extends IConnectivityManager.Stub {
int defaultVal = (SystemProperties.get("ro.tether.denied").equals("true") ? 0 : 1);
boolean tetherEnabledInSettings = (Settings.Secure.getInt(mContext.getContentResolver(),
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;
}