summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2018-09-11 22:02:49 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2018-09-11 22:02:49 +0000
commite8997689881c9bf16a738b5d50d446b15a88c062 (patch)
treeacee1a3c5f5762f48b77cdc7051b1e1c7d6b5401
parent98cd65e17f02c649bef6d7bc34fdbbf47a1cf139 (diff)
parent99c1ddc921060f54a7b4bcd7a4251b349daf2b8c (diff)
Merge "DO NOT MERGE base: getDataUsageInfo get cycle validation"
-rw-r--r--packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java b/packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java
index f7aa29796ce8..33321938fe3f 100644
--- a/packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java
+++ b/packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java
@@ -134,7 +134,7 @@ public class DataUsageController {
final NetworkStatsHistory history = session.getHistoryForNetwork(template, FIELDS);
final long now = System.currentTimeMillis();
final long start, end;
- if (policy != null) {
+ if (policy != null && policy.hasCycle()) {
final Pair<ZonedDateTime, ZonedDateTime> cycle = NetworkPolicyManager
.cycleIterator(policy).next();
start = cycle.first.toInstant().toEpochMilli();