From 72451bf6b6f6bb643c8fe268201222825495d250 Mon Sep 17 00:00:00 2001 From: Robert Greenwalt Date: Thu, 25 Feb 2010 12:04:29 -0800 Subject: [PATCH] Fix no-mobile-data after wifi. Missed a case - if you disabled mobile data and then cycled wifi, 3g would be turned back on. bug:2251458 --- .../java/com/android/server/ConnectivityService.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index df685abc17..19f4b8ae1f 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -934,9 +934,18 @@ public class ConnectivityService extends IConnectivityManager.Stub { int newType = -1; int newPriority = -1; + boolean noMobileData = !getMobileDataEnabled(); for (int checkType=0; checkType <= ConnectivityManager.MAX_NETWORK_TYPE; checkType++) { if (checkType == prevNetType) continue; if (mNetAttributes[checkType] == null) continue; + if (mNetAttributes[checkType].mRadio == ConnectivityManager.TYPE_MOBILE && + noMobileData) { + if (DBG) { + Log.d(TAG, "not failing over to mobile type " + checkType + + " because Mobile Data Disabled"); + } + continue; + } if (mNetAttributes[checkType].isDefault()) { /* TODO - if we have multiple nets we could use * we may want to put more thought into which we choose