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

Commit 78d0cf79 authored by Wink Saville's avatar Wink Saville Committed by Android (Google) Code Review
Browse files

Merge "Tighten condition for calling checkMobileProvisioning." into klp-dev

parents f5aba5ad 127beffb

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

+5 −2
Original line number Diff line number Diff line
@@ -2953,8 +2953,11 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
                    if (ConnectivityManager.isNetworkTypeMobile(info.getType())

                            && (0 != Settings.Global.getInt(mContext.getContentResolver(),

                                        Settings.Global.DEVICE_PROVISIONED, 0))

                            && ((state == NetworkInfo.State.CONNECTED)

                            && (((state == NetworkInfo.State.CONNECTED)

                                    && (info.getType() == ConnectivityManager.TYPE_MOBILE))

                                || info.isConnectedToProvisioningNetwork())) {

                        log("ConnectivityChange checkMobileProvisioning for"

                                + " TYPE_MOBILE or ProvisioningNetwork");

                        checkMobileProvisioning(CheckMp.MAX_TIMEOUT_MS);

                    }