Merge "Fix DataUsageSummary in no sim state."

This commit is contained in:
Jason Monk
2016-01-20 16:37:01 +00:00
committed by Android (Google) Code Review

View File

@@ -89,10 +89,10 @@ public class DataUsageSummary extends DataUsageBase implements Indexable {
if (hasMobileData) { if (hasMobileData) {
List<SubscriptionInfo> subscriptions = List<SubscriptionInfo> subscriptions =
services.mSubscriptionManager.getActiveSubscriptionInfoList(); services.mSubscriptionManager.getActiveSubscriptionInfoList();
if (subscriptions.size() == 0) { if (subscriptions == null || subscriptions.size() == 0) {
addMobileSection(defaultSubId); addMobileSection(defaultSubId);
} }
for (int i = 0; i < subscriptions.size(); i++) { for (int i = 0; subscriptions != null && i < subscriptions.size(); i++) {
addMobileSection(subscriptions.get(i).getSubscriptionId()); addMobileSection(subscriptions.get(i).getSubscriptionId());
} }
} }