commit 34de9f6bf8ef7374d87cab68fafe323900887d40
author Jason Monk <jmonk@google.com> Thu Jan 21 09:43:35 2016 -0500
committer Jason Monk <jmonk@google.com> Thu Jan 21 09:43:35 2016 -0500
tree 17a7381caf00bbebd5dbb3e2ddc16ab2560e2b39
parent ad1a279ac1e101908e226f78d71af2eead74265a

Protect against missing subscriptions

Bug: 26676464
Change-Id: I428dd60e6774f7ca88423edb7a87e51ee8a7dadd

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 65e0217..f9c9ba6 100644
--- a/src/com/android/settings/datausage/DataUsageSummary.java
+++ b/src/com/android/settings/datausage/DataUsageSummary.java
@@ -77,6 +77,9 @@
         addPreferencesFromResource(R.xml.data_usage);
 
         int defaultSubId = getDefaultSubscriptionId(getContext());
+        if (defaultSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+            hasMobileData = false;
+        }
         mDefaultTemplate = getDefaultTemplate(getContext(), defaultSubId);
         if (hasMobileData) {
             mLimitPreference = findPreference(KEY_LIMIT_SUMMARY);
@@ -279,7 +282,7 @@
     }
 
     public static NetworkTemplate getDefaultTemplate(Context context, int defaultSubId) {
-        if (hasMobileData(context)) {
+        if (hasMobileData(context) && defaultSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
             TelephonyManager telephonyManager = TelephonyManager.from(context);
             NetworkTemplate mobileAll = NetworkTemplate.buildTemplateMobileAll(
                     telephonyManager.getSubscriberId(defaultSubId));