Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 87343eff: am 28fbe040: Merge "Fix missing subscription list changes" into lmp-mr1-dev

Browse Source 
* commit '87343eff543a127c29e0fa47c9c276b3e9b92d57':
  Fix missing subscription list changes
This commit is contained in:
Jason Monk
2014-12-19 15:06:43 +00:00
committed by Android Git Automerger
parent 20e52c3453 87343eff54
commit bce72316c5
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
View File

@@ -426,6 +426,9 @@ public class NetworkControllerImpl extends BroadcastReceiver
return; return;
} }
List<SubscriptionInfo> subscriptions = mSubscriptionManager.getActiveSubscriptionInfoList(); 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 there have been no relevant changes to any of the subscriptions, we can leave as is.
if (hasCorrectMobileControllers(subscriptions)) { if (hasCorrectMobileControllers(subscriptions)) {
// Even if the controllers are correct, make sure we have the right no sims state. // 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) { private boolean hasCorrectMobileControllers(List<SubscriptionInfo> allSubscriptions) {
if (allSubscriptions == null) { if (allSubscriptions.size() != mMobileSignalControllers.size()) {
// If null then the system doesn't know the subscriptions yet, instead just wait return false;
// to update the MobileControllers until it knows the state.
return true;
} }
for (SubscriptionInfo info : allSubscriptions) { for (SubscriptionInfo info : allSubscriptions) {
if (!mMobileSignalControllers.containsKey(info.getSubscriptionId())) { if (!mMobileSignalControllers.containsKey(info.getSubscriptionId())) {
@@ -812,7 +813,8 @@ public class NetworkControllerImpl extends BroadcastReceiver
private final OnSubscriptionsChangedListener mSubscriptionListener = private final OnSubscriptionsChangedListener mSubscriptionListener =
new OnSubscriptionsChangedListener() { new OnSubscriptionsChangedListener() {
public void onSubscriptionInfoChanged() { @Override
public void onSubscriptionsChanged() {
updateMobileControllers(); updateMobileControllers();
}; };
}; };