Return "null" cycles for deprecated callers.

Callers using the deprecated Pair<ZonedDateTime, ZonedDateTime>
interface don't always check hasNext() before calling next(), so
give them (null, null) results instead of throwing.

Bug: 78020489
Test: builds, boots
Change-Id: Ibaeac646fa4e12e3e748cd7c706524d51dbeaafe

1 files changed, 6 insertions, 2 deletions

diff --git a/core/java/android/net/NetworkPolicyManager.java b/core/java/android/net/NetworkPolicyManager.java
index 6546c391799b..75fd77e70a1b 100644
--- 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);
+                }
             }
         };
     }