Commit e67463db authored Apr 13, 2018 by Jeff Sharkey

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

parent 213639c9

core/java/android/net/NetworkPolicyManager.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -270,8 +270,12 @@ public class NetworkPolicyManager {

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