diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-01-10 11:58:31 -0800 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2011-01-12 15:52:10 -0800 |
| commit | 19b9ab46a9faee6031aaf6c78748401943fea117 (patch) | |
| tree | a1ea2b76d2b2958f8028a7d0f39d1201391e4617 /services/java/com/android/server/ConnectivityService.java | |
| parent | 7a8f01abf98b6212358ea0e0401879093d2c0f93 (diff) | |
Turn off DUN connection after tethering.
Use matching feature type when turning tethering off or the request is ignored.
Also, turn on DUN apn right away so that we don't fail aggressive test cases.
Also don't report connections for enabled apn's that we're no longer connected to.
bug:3332880
bug:3338033
Change-Id: I7db2dfd4879f03465bc9f6d39488c078570dcaf3
Diffstat (limited to 'services/java/com/android/server/ConnectivityService.java')
| -rw-r--r-- | services/java/com/android/server/ConnectivityService.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index a3d8ac912e78..2321e30f3f5c 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -849,7 +849,8 @@ public class ConnectivityService extends IConnectivityManager.Stub { usedNetworkType = ConnectivityManager.TYPE_MOBILE_MMS; } else if (TextUtils.equals(feature, Phone.FEATURE_ENABLE_SUPL)) { usedNetworkType = ConnectivityManager.TYPE_MOBILE_SUPL; - } else if (TextUtils.equals(feature, Phone.FEATURE_ENABLE_DUN)) { + } else if (TextUtils.equals(feature, Phone.FEATURE_ENABLE_DUN) || + TextUtils.equals(feature, Phone.FEATURE_ENABLE_DUN_ALWAYS)) { usedNetworkType = ConnectivityManager.TYPE_MOBILE_DUN; } else if (TextUtils.equals(feature, Phone.FEATURE_ENABLE_HIPRI)) { usedNetworkType = ConnectivityManager.TYPE_MOBILE_HIPRI; @@ -870,6 +871,8 @@ public class ConnectivityService extends IConnectivityManager.Stub { return 1; } callTeardown = true; + } else { + if (DBG) log("not a known feature - dropping"); } } if (DBG) log("Doing network teardown"); |