diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2013-10-16 18:48:08 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2013-10-16 18:48:08 +0530 |
| commit | de3d31ee8e666f5a07a3f861ab53bb4ca42ba697 (patch) | |
| tree | a80b77f0875e95c6d0d9c2735ae39b1fafe40192 | |
| parent | 61ad8c3ac547c0ae29c7ce007735e02b418fe911 (diff) | |
| parent | 0c82481e783a2fa7d97bbd6140be3f8c3642e4e0 (diff) | |
| download | base-linaro_android_4.3_juice.tar.gz | |
Merge android-4.3.1_r1:linaro_android_4.3_juice
Android 4.3.1 Release 1
# gpg: Signature made Tuesday 08 October 2013 12:09:28 AM IST using DSA key ID 9AB10E78
# gpg: Can't check signature: public key not found
* tag 'android-4.3.1_r1':
Do not always call setIsConnectedToProvisioningNetwork(false)
| -rw-r--r-- | core/java/android/net/MobileDataStateTracker.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/net/MobileDataStateTracker.java b/core/java/android/net/MobileDataStateTracker.java index e09254b18419..b2b5314b281b 100644 --- a/core/java/android/net/MobileDataStateTracker.java +++ b/core/java/android/net/MobileDataStateTracker.java @@ -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) { |