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

Merge "Query correct subscription id for mobile data."

Browse Source
This commit is contained in:
TreeHugger Robot
2019-01-25 01:43:06 +00:00
committed by Android (Google) Code Review
parent dda0c63d5b 9c2556da09
commit 7e19cfbbe1
3 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/datausage/DataUsageList.java
View File

@@ -135,8 +135,8 @@ public class DataUsageList extends DataUsageBaseFragment {
mUidDetailProvider = new UidDetailProvider(activity);
mTelephonyManager = activity.getSystemService(TelephonyManager.class);
mUsageAmount = findPreference(KEY_USAGE_AMOUNT);
mChart = (ChartDataUsagePreference) findPreference(KEY_CHART_DATA);
mApps = (PreferenceGroup) findPreference(KEY_APPS_GROUP);
mChart = findPreference(KEY_CHART_DATA);
mApps = findPreference(KEY_APPS_GROUP);
processArgument();
}
@@ -306,7 +306,7 @@ public class DataUsageList extends DataUsageBaseFragment {
getLoaderManager().restartLoader(LOADER_SUMMARY, null /* args */,
mNetworkStatsDetailCallbacks);
final long totalBytes = mCycleData != null
final long totalBytes = mCycleData != null && !mCycleData.isEmpty()
? mCycleData.get(mCycleSpinner.getSelectedItemPosition()).getTotalUsage() : 0;
final CharSequence totalPhrase = DataUsageUtils.formatDataUsage(getActivity(), totalBytes);
mUsageAmount.setTitle(getString(R.string.data_used_template, totalPhrase));

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

@@ -87,7 +87,7 @@ public class DataUsageSummary extends DataUsageBaseFragment implements DataUsage
boolean hasMobileData = DataUsageUtils.hasMobileData(context);
int defaultSubId = DataUsageUtils.getDefaultSubscriptionId(context);
final int defaultSubId = SubscriptionManager.getDefaultDataSubscriptionId();
if (defaultSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
hasMobileData = false;
}