From 02551ecd2e31e597144e7d194b772aa4b1a7a750 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Mon, 19 Oct 2015 17:22:05 -0700 Subject: Hide empty data usage cycles. When building list of historical data usage cycles, omit cycles that don't contain any data usage. A bad NITZ or NTP fix may have caused us to record some usage in 1970 or 2038, which would have shown all the cycles in between. Now we hide empty cycles to keep things clean. Bug: 18282691 Change-Id: Ib04c95d1411400ba9967d311b59402a26d39cfe3 --- src/com/android/settings/DataUsageSummary.java | 29 +++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java index e014465..135328b 100644 --- a/src/com/android/settings/DataUsageSummary.java +++ b/src/com/android/settings/DataUsageSummary.java @@ -1166,6 +1166,7 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable mCycleAdapter.clear(); final Context context = mCycleSpinner.getContext(); + NetworkStatsHistory.Entry entry = null; long historyStart = Long.MAX_VALUE; long historyEnd = Long.MIN_VALUE; @@ -1188,9 +1189,20 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable final long cycleStart = computeLastCycleBoundary(cycleEnd, policy); Log.d(TAG, "generating cs=" + cycleStart + " to ce=" + cycleEnd + " waiting for hs=" + historyStart); - mCycleAdapter.add(new CycleItem(context, cycleStart, cycleEnd)); + + final boolean includeCycle; + if (mChartData != null) { + entry = mChartData.network.getValues(cycleStart, cycleEnd, entry); + includeCycle = (entry.rxBytes + entry.txBytes) > 0; + } else { + includeCycle = true; + } + + if (includeCycle) { + mCycleAdapter.add(new CycleItem(context, cycleStart, cycleEnd)); + hasCycles = true; + } cycleEnd = cycleStart; - hasCycles = true; } // one last cycle entry to modify policy cycle day @@ -1202,7 +1214,18 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable long cycleEnd = historyEnd; while (cycleEnd > historyStart) { final long cycleStart = cycleEnd - (DateUtils.WEEK_IN_MILLIS * 4); - mCycleAdapter.add(new CycleItem(context, cycleStart, cycleEnd)); + + final boolean includeCycle; + if (mChartData != null) { + entry = mChartData.network.getValues(cycleStart, cycleEnd, entry); + includeCycle = (entry.rxBytes + entry.txBytes) > 0; + } else { + includeCycle = true; + } + + if (includeCycle) { + mCycleAdapter.add(new CycleItem(context, cycleStart, cycleEnd)); + } cycleEnd = cycleStart; } -- cgit v1.1