Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread (ec944728) · Commits · e / os / android_frameworks_base

services/java/com/android/server/ConnectivityService.java

+19 −0

Original line number	Diff line number	Diff line
		@@ -391,6 +391,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 " +
		@@ -987,6 +991,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;
		@@ -996,6 +1006,9 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		nt.teardown();
		}
		}
		if (mNetTrackers[ConnectivityManager.TYPE_WIMAX] != null) {
		mNetTrackers[ConnectivityManager.TYPE_WIMAX].teardown();
		}
		}
		}

		@@ -1124,6 +1137,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()) {