Always file DUN requests for tethering.
A bit of a hack so that first trySetupData call uses the proper APN in strange edge cases. Made a new startUsingNetworkFeature string that ConnectivityService knows means always pass the request to telephony even if telephony connections are not currently available. bug:3133178 Change-Id: I2559b9cbaed4b4ec02bdf7ea78e6003ee2be64f2
This commit is contained in:
@@ -697,7 +697,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;
|
||||||
@@ -712,7 +713,11 @@ public class ConnectivityService extends IConnectivityManager.Stub {
|
|||||||
|
|
||||||
if (ni.isAvailable() == false) {
|
if (ni.isAvailable() == false) {
|
||||||
if (DBG) log("special network not available");
|
if (DBG) log("special network not available");
|
||||||
|
if (!TextUtils.equals(feature,Phone.FEATURE_ENABLE_DUN_ALWAYS)) {
|
||||||
return Phone.APN_TYPE_NOT_AVAILABLE;
|
return Phone.APN_TYPE_NOT_AVAILABLE;
|
||||||
|
} else {
|
||||||
|
// else make the attempt anyway - probably giving REQUEST_STARTED below
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
synchronized(this) {
|
synchronized(this) {
|
||||||
|
|||||||
Reference in New Issue
Block a user