Merge "Return "null" cycles for deprecated callers." into pi-dev

am: 9eb0a655cc Change-Id: Ibe9928effca29598c59f440018977474debbee4b
2018-04-14 18:39:00 -07:00
parent 0511a75ae8 9eb0a655cc
commit fcbbe0f9c7
1 changed files with 6 additions and 2 deletions
--- a/core/java/android/net/NetworkPolicyManager.java
+++ b/core/java/android/net/NetworkPolicyManager.java
@@ -270,8 +270,12 @@ public class NetworkPolicyManager {

            @Override
            public Pair<ZonedDateTime, ZonedDateTime> next() {
-                final Range<ZonedDateTime> r = it.next();
-                return Pair.create(r.getLower(), r.getUpper());
+                if (hasNext()) {
+                    final Range<ZonedDateTime> r = it.next();
+                    return Pair.create(r.getLower(), r.getUpper());
+                } else {
+                    return Pair.create(null, null);
+                }
            }
        };
    }