PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Protect against missing subscriptions

Browse Source 
Bug: 26676464
Change-Id: I428dd60e6774f7ca88423edb7a87e51ee8a7dadd
This commit is contained in:
Jason Monk
2016-01-21 09:43:35 -05:00
parent ad1a279ac1
commit 34de9f6bf8
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/datausage/DataUsageSummary.java
View File

@@ -77,6 +77,9 @@ public class DataUsageSummary extends DataUsageBase implements Indexable {
addPreferencesFromResource(R.xml.data_usage); addPreferencesFromResource(R.xml.data_usage);
int defaultSubId = getDefaultSubscriptionId(getContext()); int defaultSubId = getDefaultSubscriptionId(getContext());
if (defaultSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
hasMobileData = false;
}
mDefaultTemplate = getDefaultTemplate(getContext(), defaultSubId); mDefaultTemplate = getDefaultTemplate(getContext(), defaultSubId);
if (hasMobileData) { if (hasMobileData) {
mLimitPreference = findPreference(KEY_LIMIT_SUMMARY); mLimitPreference = findPreference(KEY_LIMIT_SUMMARY);
@@ -279,7 +282,7 @@ public class DataUsageSummary extends DataUsageBase implements Indexable {
} }
public static NetworkTemplate getDefaultTemplate(Context context, int defaultSubId) { public static NetworkTemplate getDefaultTemplate(Context context, int defaultSubId) {
if (hasMobileData(context)) { if (hasMobileData(context) && defaultSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
TelephonyManager telephonyManager = TelephonyManager.from(context); TelephonyManager telephonyManager = TelephonyManager.from(context);
NetworkTemplate mobileAll = NetworkTemplate.buildTemplateMobileAll( NetworkTemplate mobileAll = NetworkTemplate.buildTemplateMobileAll(
telephonyManager.getSubscriberId(defaultSubId)); telephonyManager.getSubscriberId(defaultSubId));