From 71a2a4f89b0124964c16a0ca2091707993b7fc94 Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Wed, 20 Jan 2016 11:33:46 -0500 Subject: [PATCH] Fix DataUsageSummary in no sim state. Bug: 26676464 Change-Id: I7fad5240f1160a2eb38a7cff2ae2f1c9e40bc4d3 --- src/com/android/settings/datausage/DataUsageSummary.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java index de98008b477..65e0217b5b6 100644 --- a/src/com/android/settings/datausage/DataUsageSummary.java +++ b/src/com/android/settings/datausage/DataUsageSummary.java @@ -89,10 +89,10 @@ public class DataUsageSummary extends DataUsageBase implements Indexable { if (hasMobileData) { List subscriptions = services.mSubscriptionManager.getActiveSubscriptionInfoList(); - if (subscriptions.size() == 0) { + if (subscriptions == null || subscriptions.size() == 0) { 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()); } }