| Revision | dc921d3fa770fd5b68fc88a84f6f26f9f2f5042e (tree) |
|---|---|
| Time | 2013-10-20 03:52:16 |
| Author | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
Merge tag 'android-4.3.1_r1' into jb-x86
Android 4.3.1 Release 1
| @@ -190,8 +190,6 @@ public class MobileDataStateTracker implements NetworkStateTracker { | ||
| 190 | 190 | private class MobileDataStateReceiver extends BroadcastReceiver { |
| 191 | 191 | @Override |
| 192 | 192 | public void onReceive(Context context, Intent intent) { |
| 193 | - // Assume this isn't a provisioning network. | |
| 194 | - mNetworkInfo.setIsConnectedToProvisioningNetwork(false); | |
| 195 | 193 | if (intent.getAction().equals(TelephonyIntents. |
| 196 | 194 | ACTION_DATA_CONNECTION_CONNECTED_TO_PROVISIONING_APN)) { |
| 197 | 195 | String apnName = intent.getStringExtra(PhoneConstants.DATA_APN_KEY); |
| @@ -218,6 +216,8 @@ public class MobileDataStateTracker implements NetworkStateTracker { | ||
| 218 | 216 | if (!TextUtils.equals(apnType, mApnType)) { |
| 219 | 217 | return; |
| 220 | 218 | } |
| 219 | + // Assume this isn't a provisioning network. | |
| 220 | + mNetworkInfo.setIsConnectedToProvisioningNetwork(false); | |
| 221 | 221 | if (DBG) { |
| 222 | 222 | log("Broadcast received: " + intent.getAction() + " apnType=" + apnType); |
| 223 | 223 | } |
| @@ -299,6 +299,8 @@ public class MobileDataStateTracker implements NetworkStateTracker { | ||
| 299 | 299 | if (!TextUtils.equals(apnType, mApnType)) { |
| 300 | 300 | return; |
| 301 | 301 | } |
| 302 | + // Assume this isn't a provisioning network. | |
| 303 | + mNetworkInfo.setIsConnectedToProvisioningNetwork(false); | |
| 302 | 304 | String reason = intent.getStringExtra(PhoneConstants.FAILURE_REASON_KEY); |
| 303 | 305 | String apnName = intent.getStringExtra(PhoneConstants.DATA_APN_KEY); |
| 304 | 306 | if (DBG) { |
Android-x86
Fork
core/java/android/net/MobileDataStateTracker.java