diff options
| author | Jason Monk <jmonk@google.com> | 2014-12-19 15:06:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-19 15:06:43 +0000 |
| commit | bce72316c5ef39dc4669a8e0a023d43c78535bb4 (patch) | |
| tree | f7f011761526d4e5e07e8ab934a3a25d40242166 /packages/SystemUI/src | |
| parent | 20e52c3453b2683cccfc4ac0841c9d6ef0796f88 (diff) | |
| parent | 87343eff543a127c29e0fa47c9c276b3e9b92d57 (diff) | |
| download | frameworks_base-bce72316c5ef39dc4669a8e0a023d43c78535bb4.zip frameworks_base-bce72316c5ef39dc4669a8e0a023d43c78535bb4.tar.gz frameworks_base-bce72316c5ef39dc4669a8e0a023d43c78535bb4.tar.bz2 | |
am 87343eff: am 28fbe040: Merge "Fix missing subscription list changes" into lmp-mr1-dev
* commit '87343eff543a127c29e0fa47c9c276b3e9b92d57':
Fix missing subscription list changes
Diffstat (limited to 'packages/SystemUI/src')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java index 81c6da5..5eebf3c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java @@ -426,6 +426,9 @@ public class NetworkControllerImpl extends BroadcastReceiver return; } List<SubscriptionInfo> subscriptions = mSubscriptionManager.getActiveSubscriptionInfoList(); + if (subscriptions == null) { + subscriptions = Collections.emptyList(); + } // If there have been no relevant changes to any of the subscriptions, we can leave as is. if (hasCorrectMobileControllers(subscriptions)) { // Even if the controllers are correct, make sure we have the right no sims state. @@ -500,10 +503,8 @@ public class NetworkControllerImpl extends BroadcastReceiver } private boolean hasCorrectMobileControllers(List<SubscriptionInfo> allSubscriptions) { - if (allSubscriptions == null) { - // If null then the system doesn't know the subscriptions yet, instead just wait - // to update the MobileControllers until it knows the state. - return true; + if (allSubscriptions.size() != mMobileSignalControllers.size()) { + return false; } for (SubscriptionInfo info : allSubscriptions) { if (!mMobileSignalControllers.containsKey(info.getSubscriptionId())) { @@ -812,7 +813,8 @@ public class NetworkControllerImpl extends BroadcastReceiver private final OnSubscriptionsChangedListener mSubscriptionListener = new OnSubscriptionsChangedListener() { - public void onSubscriptionInfoChanged() { + @Override + public void onSubscriptionsChanged() { updateMobileControllers(); }; }; |