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

Commit 0871ac2a authored by Wink Saville's avatar Wink Saville Committed by Android Git Automerger
Browse files

am b96cca27: am df43ba82: am e3badc10: Merge "When a SIM is changed check... 

am b96cca27: am df43ba82: am e3badc10: Merge "When a SIM is changed check mobile provisioning." into jb-mr2-dev

* commit 'b96cca27':
  When a SIM is changed check mobile provisioning.
parents 903709d7 b96cca27

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

+16 −0
Original line number Original line Diff line number Diff line
@@ -381,6 +381,9 @@ public class ConnectivityService extends IConnectivityManager.Stub { 




    TelephonyManager mTelephonyManager;

    TelephonyManager mTelephonyManager;





    // We only want one checkMobileProvisioning after booting.

    volatile boolean mFirstProvisioningCheckStarted = false;



    public ConnectivityService(Context context, INetworkManagementService netd,

    public ConnectivityService(Context context, INetworkManagementService netd,

            INetworkStatsService statsService, INetworkPolicyManager policyManager) {

            INetworkStatsService statsService, INetworkPolicyManager policyManager) {

        // Currently, omitting a NetworkFactory will create one internally

        // Currently, omitting a NetworkFactory will create one internally
@@ -2755,6 +2758,17 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
                            state + "/" + info.getDetailedState());

                            state + "/" + info.getDetailedState());

                    }

                    }





                    // After booting we'll check once for mobile provisioning

                    // if we've provisioned by and connected.

                    if (!mFirstProvisioningCheckStarted

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

                                        Settings.Global.DEVICE_PROVISIONED, 0))

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

                        log("check provisioning after booting");

                        mFirstProvisioningCheckStarted = true;

                        checkMobileProvisioning(true, CheckMp.MAX_TIMEOUT_MS, null);

                    }



                    EventLogTags.writeConnectivityStateChanged(

                    EventLogTags.writeConnectivityStateChanged(

                            info.getType(), info.getSubtype(), info.getDetailedState().ordinal());

                            info.getType(), info.getSubtype(), info.getDetailedState().ordinal());
@@ -3677,6 +3691,8 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
                + " resultReceiver=" + resultReceiver);

                + " resultReceiver=" + resultReceiver);

        enforceChangePermission();

        enforceChangePermission();





        mFirstProvisioningCheckStarted = true;



        int timeOutMs = suggestedTimeOutMs;

        int timeOutMs = suggestedTimeOutMs;

        if (suggestedTimeOutMs > CheckMp.MAX_TIMEOUT_MS) {

        if (suggestedTimeOutMs > CheckMp.MAX_TIMEOUT_MS) {

            timeOutMs = CheckMp.MAX_TIMEOUT_MS;

            timeOutMs = CheckMp.MAX_TIMEOUT_MS;