commit 7474fe7b421dcc190c4602389ca0f9c910382260
author Jeff Sharkey <jsharkey@android.com> Mon Mar 21 13:12:59 2016 -0600
committer Jeff Sharkey <jsharkey@android.com> Mon Mar 21 13:13:28 2016 -0600
tree 4c98ed5e3e07b0226104296139601b8cbc7ffa2d
parent 1af4a7b5bf611a3af931681ea1514513e9cc4c51

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

diff --git a/core/java/android/net/NetworkTemplate.java b/core/java/android/net/NetworkTemplate.java
index 5761d66..d847cd0 100644
--- a/core/java/android/net/NetworkTemplate.java
+++ b/core/java/android/net/NetworkTemplate.java
@@ -250,6 +250,16 @@
         }
     }
 
+    public boolean isPersistable() {
+        switch (mMatchRule) {
+            case MATCH_MOBILE_WILDCARD:
+            case MATCH_WIFI_WILDCARD:
+                return false;
+            default:
+                return true;
+        }
+    }
+
     public int getMatchRule() {
         return mMatchRule;
     }