From f28f2820ab0a1eff3d747de5cc3a43b4acd88f53 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Mon, 21 Mar 2016 13:12:59 -0600 Subject: [PATCH] Ignore wildcard network policies. They never should have been persisted to disk in the first place. Bug: 24972775 Change-Id: If9254f74455823f9fda9545fdf543fc7250a4016 --- core/java/android/net/NetworkTemplate.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/core/java/android/net/NetworkTemplate.java b/core/java/android/net/NetworkTemplate.java index 5761d66dde..d847cd0e7c 100644 --- a/core/java/android/net/NetworkTemplate.java +++ b/core/java/android/net/NetworkTemplate.java @@ -250,6 +250,16 @@ public class NetworkTemplate implements Parcelable { } } + public boolean isPersistable() { + switch (mMatchRule) { + case MATCH_MOBILE_WILDCARD: + case MATCH_WIFI_WILDCARD: + return false; + default: + return true; + } + } + public int getMatchRule() { return mMatchRule; }