am 4b43f944: am 495056ab: Merge "Turn off DUN connection after tethering." into honeycomb
* commit '4b43f94499b6d0c4a34961d48b97d5e48a039f65': Turn off DUN connection after tethering.
This commit is contained in:
@@ -849,7 +849,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
|
|||||||
usedNetworkType = ConnectivityManager.TYPE_MOBILE_MMS;
|
usedNetworkType = ConnectivityManager.TYPE_MOBILE_MMS;
|
||||||
} else if (TextUtils.equals(feature, Phone.FEATURE_ENABLE_SUPL)) {
|
} else if (TextUtils.equals(feature, Phone.FEATURE_ENABLE_SUPL)) {
|
||||||
usedNetworkType = ConnectivityManager.TYPE_MOBILE_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;
|
usedNetworkType = ConnectivityManager.TYPE_MOBILE_DUN;
|
||||||
} else if (TextUtils.equals(feature, Phone.FEATURE_ENABLE_HIPRI)) {
|
} else if (TextUtils.equals(feature, Phone.FEATURE_ENABLE_HIPRI)) {
|
||||||
usedNetworkType = ConnectivityManager.TYPE_MOBILE_HIPRI;
|
usedNetworkType = ConnectivityManager.TYPE_MOBILE_HIPRI;
|
||||||
@@ -870,6 +871,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
callTeardown = true;
|
callTeardown = true;
|
||||||
|
} else {
|
||||||
|
if (DBG) log("not a known feature - dropping");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (DBG) log("Doing network teardown");
|
if (DBG) log("Doing network teardown");
|
||||||
|
|||||||
Reference in New Issue
Block a user