diff options
| -rw-r--r-- | services/java/com/android/server/ConnectivityService.java | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index a64ceb9f29c6..555975fb0eb9 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -394,6 +394,10 @@ public class ConnectivityService extends IConnectivityManager.Stub { nst.startMonitoring(); } mNetTrackers[netType] = nst; + if (noMobileData) { + if (DBG) Slog.d(TAG, "tearing down WiMAX networks due to setting"); + mNetTrackers[netType].teardown(); + } break; default: Slog.e(TAG, "Trying to create a DataStateTracker for an unknown radio type " + @@ -1018,6 +1022,12 @@ public class ConnectivityService extends IConnectivityManager.Stub { } mNetTrackers[ConnectivityManager.TYPE_MOBILE].reconnect(); } + if (mNetTrackers[ConnectivityManager.TYPE_WIMAX] != null) { + if (DBG) { + Slog.d(TAG, "starting up " + mNetTrackers[ConnectivityManager.TYPE_WIMAX]); + } + mNetTrackers[ConnectivityManager.TYPE_WIMAX].reconnect(); + } } else { for (NetworkStateTracker nt : mNetTrackers) { if (nt == null) continue; @@ -1027,6 +1037,9 @@ public class ConnectivityService extends IConnectivityManager.Stub { nt.teardown(); } } + if (mNetTrackers[ConnectivityManager.TYPE_WIMAX] != null) { + mNetTrackers[ConnectivityManager.TYPE_WIMAX].teardown(); + } } } @@ -1155,6 +1168,12 @@ public class ConnectivityService extends IConnectivityManager.Stub { " because Mobile Data Disabled"); continue; } + if (mNetAttributes[checkType].mRadio == ConnectivityManager.TYPE_WIMAX && + noMobileData) { + Slog.e(TAG, "not failing over to mobile type " + checkType + + " because Mobile Data Disabled"); + continue; + } NetworkStateTracker checkTracker = mNetTrackers[checkType]; NetworkInfo checkInfo = checkTracker.getNetworkInfo(); if (!checkInfo.isConnectedOrConnecting() || checkTracker.isTeardownRequested()) { |