commit b484d74d73a4ff106b9ead885d5479252cec207d
author Jason Monk <jmonk@google.com> Wed Jan 20 16:37:01 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 20 16:37:01 2016 +0000
tree 2f503f346e43240364f7e532b6fd083e13bb7f8c
parent 7b9a1a19956355d9d1ae5848c91bd2af834bd46b
parent 71a2a4f89b0124964c16a0ca2091707993b7fc94

Merge "Fix DataUsageSummary in no sim state."

src/com/android/settings/datausage/DataUsageSummary.java

diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java
index de98008..65e0217 100644
--- a/src/com/android/settings/datausage/DataUsageSummary.java
+++ b/src/com/android/settings/datausage/DataUsageSummary.java
@@ -89,10 +89,10 @@
         if (hasMobileData) {
             List<SubscriptionInfo> 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());
             }
         }