Merge tag 'android-4.3.1_r1' into HEAD (70d81b7d) · Commits · e / os / android_frameworks_base

core/java/android/net/MobileDataStateTracker.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -190,8 +190,6 @@ public class MobileDataStateTracker implements NetworkStateTracker {
		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);
		@@ -218,6 +216,8 @@ public class MobileDataStateTracker implements NetworkStateTracker {
		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);
		}
		@@ -299,6 +299,8 @@ public class MobileDataStateTracker implements NetworkStateTracker {
		if (!TextUtils.equals(apnType, mApnType)) {
		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) {