Merge commit '53221120' into fix-merge-conflict (56065891) · Commits · e / os / android_frameworks_base

core/java/android/net/MobileDataStateTracker.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -211,8 +211,6 @@ public class MobileDataStateTracker extends BaseNetworkStateTracker {
		private class MobileDataStateReceiver extends BroadcastReceiver {
		@Override
		public void onReceive(Context context, Intent intent) {
		// Assume this isn't a provisioning network.
		mNetworkInfo.setIsConnectedToProvisioningNetwork(false);
		if (intent.getAction().equals(TelephonyIntents.
		ACTION_DATA_CONNECTION_CONNECTED_TO_PROVISIONING_APN)) {
		String apnName = intent.getStringExtra(PhoneConstants.DATA_APN_KEY);
		@@ -244,6 +242,11 @@ public class MobileDataStateTracker extends BaseNetworkStateTracker {
		if (!TextUtils.equals(apnType, mApnType)) {
		return;
		}
		// Assume this isn't a provisioning network.
		mNetworkInfo.setIsConnectedToProvisioningNetwork(false);
		if (DBG) {
		log("Broadcast received: " + intent.getAction() + " apnType=" + apnType);
		}

		int oldSubtype = mNetworkInfo.getSubtype();
		int newSubType = TelephonyManager.getDefault().getNetworkType();
		@@ -351,6 +354,8 @@ public class MobileDataStateTracker extends BaseNetworkStateTracker {
		}
		return;
		}
		// Assume this isn't a provisioning network.
		mNetworkInfo.setIsConnectedToProvisioningNetwork(false);
		String reason = intent.getStringExtra(PhoneConstants.FAILURE_REASON_KEY);
		String apnName = intent.getStringExtra(PhoneConstants.DATA_APN_KEY);
		if (DBG) {