drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't forget to turn off mobile_dun"

Browse Source
This commit is contained in:
Robert Greenwalt
2012-03-01 08:13:24 -08:00
committed by Android (Google) Code Review
parent 592c85cd6c c9dac1185d
commit 10bcb6fbb1
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/java/com/android/server/connectivity/Tethering.java
View File

@ -1215,6 +1215,8 @@ public class Tethering extends INetworkManagementEventObserver.Stub {
return retValue;
}
protected boolean turnOffUpstreamMobileConnection() {
// ignore pending renewal requests
++mCurrentConnectionSequence;
if (mMobileApnReserved != ConnectivityManager.TYPE_NONE) {
try {
mConnService.stopUsingNetworkFeature(ConnectivityManager.TYPE_MOBILE,
@ -1304,6 +1306,14 @@ public class Tethering extends INetworkManagementEventObserver.Stub {
if (upType == ConnectivityManager.TYPE_MOBILE_DUN ||
upType == ConnectivityManager.TYPE_MOBILE_HIPRI) {
turnOnUpstreamMobileConnection(upType);
} else if (upType != ConnectivityManager.TYPE_NONE) {
/* If we've found an active upstream connection that's not DUN/HIPRI
* we should stop any outstanding DUN/HIPRI start requests.
*
* If we found NONE we don't want to do this as we want any previous
* requests to keep trying to bring up something we can use.
*/
turnOffUpstreamMobileConnection();
}
if (upType == ConnectivityManager.TYPE_NONE) {