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

Merge "[Settings] Align data usage calculation" into rvc-dev

Browse Source
This commit is contained in:
Bonian Chen
2020-04-28 06:13:58 +00:00
committed by Android (Google) Code Review
parent e0adf5bfd6 260ad5c523
commit 0e385a58de
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
View File

@@ -210,6 +210,11 @@ public class DataUsageSummaryPreferenceController extends TelephonyBasePreferenc
final DataUsageController.DataUsageInfo info = final DataUsageController.DataUsageInfo info =
mDataUsageController.getDataUsageInfo(mDefaultTemplate); mDataUsageController.getDataUsageInfo(mDefaultTemplate);
long usageLevel = info.usageLevel;
if (usageLevel <= 0L) {
usageLevel = mDataUsageController.getHistoricalUsageLevel(mDefaultTemplate);
}
if (subInfo != null) { if (subInfo != null) {
mDataInfoController.updateDataLimit(info, mPolicyEditor.getPolicy(mDefaultTemplate)); mDataInfoController.updateDataLimit(info, mPolicyEditor.getPolicy(mDefaultTemplate));
summaryPreference.setWifiMode(/* isWifiMode */ false, summaryPreference.setWifiMode(/* isWifiMode */ false,
@@ -218,7 +223,7 @@ public class DataUsageSummaryPreferenceController extends TelephonyBasePreferenc
summaryPreference.setWifiMode(/* isWifiMode */ true, /* usagePeriod */ summaryPreference.setWifiMode(/* isWifiMode */ true, /* usagePeriod */
info.period, /* isSingleWifi */ false); info.period, /* isSingleWifi */ false);
summaryPreference.setLimitInfo(null); summaryPreference.setLimitInfo(null);
summaryPreference.setUsageNumbers(info.usageLevel, summaryPreference.setUsageNumbers(usageLevel,
/* dataPlanSize */ -1L, /* dataPlanSize */ -1L,
/* hasMobileData */ true); /* hasMobileData */ true);
summaryPreference.setChartEnabled(false); summaryPreference.setChartEnabled(false);
@@ -231,6 +236,11 @@ public class DataUsageSummaryPreferenceController extends TelephonyBasePreferenc
} }
refreshDataplanInfo(info, subInfo); refreshDataplanInfo(info, subInfo);
if ((mDataplanUse <= 0L) && (mSnapshotTime < 0)) {
Log.d(TAG, "Display data usage from history");
mDataplanUse = usageLevel;
mSnapshotTime = -1L;
}
if (info.warningLevel > 0 && info.limitLevel > 0) { if (info.warningLevel > 0 && info.limitLevel > 0) {
summaryPreference.setLimitInfo(TextUtils.expandTemplate( summaryPreference.setLimitInfo(TextUtils.expandTemplate(