Merge "When a SIM is changed check mobile provisioning." into jb-mr2-dev (e3badc10) · Commits · e / os / android_frameworks_base

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

+16 −0

Original line number	Diff line number	Diff line
		@@ -375,6 +375,9 @@ public class ConnectivityService extends IConnectivityManager.Stub {

		TelephonyManager mTelephonyManager;

		// We only want one checkMobileProvisioning after booting.
		volatile boolean mFirstProvisioningCheckStarted = false;

		public ConnectivityService(Context context, INetworkManagementService netd,
		INetworkStatsService statsService, INetworkPolicyManager policyManager) {
		// Currently, omitting a NetworkFactory will create one internally
		@@ -2730,6 +2733,17 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		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(
		info.getType(), info.getSubtype(), info.getDetailedState().ordinal());

		@@ -3548,6 +3562,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		+ " resultReceiver=" + resultReceiver);
		enforceChangePermission();

		mFirstProvisioningCheckStarted = true;

		int timeOutMs = suggestedTimeOutMs;
		if (suggestedTimeOutMs > CheckMp.MAX_TIMEOUT_MS) {
		timeOutMs = CheckMp.MAX_TIMEOUT_MS;