diff options
| author | Wink Saville <wink@google.com> | 2013-09-21 11:52:42 -0700 |
|---|---|---|
| committer | Wink Saville <wink@google.com> | 2013-09-21 11:52:42 -0700 |
| commit | 56065891abf383b0409ae595437dcb0ea132e32b (patch) | |
| tree | 9d21815c17d8eef6ff924e7a9de7ffc7cf14b034 /core/java | |
| parent | 6c025eaf29634d248bf067c2d9967e1905863f0c (diff) | |
| parent | 53221120049c2fea27158864f2e615c08d410780 (diff) | |
| download | frameworks_base-56065891abf383b0409ae595437dcb0ea132e32b.zip frameworks_base-56065891abf383b0409ae595437dcb0ea132e32b.tar.gz frameworks_base-56065891abf383b0409ae595437dcb0ea132e32b.tar.bz2 | |
Merge commit '53221120' into fix-merge-conflict
* commit '53221120':
Do not always call setIsConnectedToProvisioningNetwork(false)
Conflicts:
core/java/android/net/MobileDataStateTracker.java
Change-Id: I497b57cb96d0f3b3bce4f4e1cbc5febcc6421597
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/MobileDataStateTracker.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/core/java/android/net/MobileDataStateTracker.java b/core/java/android/net/MobileDataStateTracker.java index b914940..c106514 100644 --- a/core/java/android/net/MobileDataStateTracker.java +++ b/core/java/android/net/MobileDataStateTracker.java @@ -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) { |