commit e8997689881c9bf16a738b5d50d446b15a88c062
author Treehugger Robot <treehugger-gerrit@google.com> Tue Sep 11 22:02:49 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 11 22:02:49 2018 +0000
tree acee1a3c5f5762f48b77cdc7051b1e1c7d6b5401
parent 98cd65e17f02c649bef6d7bc34fdbbf47a1cf139
parent 99c1ddc921060f54a7b4bcd7a4251b349daf2b8c

Merge "DO NOT MERGE base: getDataUsageInfo get cycle validation"

packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java

diff --git a/packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java b/packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java
index f7aa297..3332193 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 @@
             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();