summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@google.com>2016-03-21 21:11:56 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-03-21 21:11:57 +0000
commitc57fc4787f5aadb129686e904b86d343c8ae3541 (patch)
tree52e5c2b0b4b663f7fce80571e5ccee6a4a4c8552 /core/java
parent5c2183a8cf8661bcc1b6662ddd5ceed6cfeacdcc (diff)
parent7474fe7b421dcc190c4602389ca0f9c910382260 (diff)
Merge "Ignore wildcard network policies." into nyc-dev
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/net/NetworkTemplate.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/core/java/android/net/NetworkTemplate.java b/core/java/android/net/NetworkTemplate.java
index 5761d66dde87..d847cd0e7cf3 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;
}