Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35429599 authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

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
parent e46145f7

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

+9 −0
Original line number Diff line number Diff line
@@ -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