diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-12-21 17:24:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-21 17:24:02 +0000 |
| commit | 706c472f3f8823b35cd0eba865c47c44fe4b75f2 (patch) | |
| tree | cdd63abb5785d7889de74877ccc5c81fdd83ee03 /framework-t/src | |
| parent | dddcce6e5e028d88dd8355940332f1c625bec1d9 (diff) | |
| parent | f9610bf122f0e1fa7892a37b5dadd86464339601 (diff) | |
Merge "[MS14] Move isPersistable to NetworkPolicy" am: b6d02f2cc0 am: 9eff138160 am: 3541c40966 am: f9610bf122
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1925762
Change-Id: I63fab97dc3c78143854055427c939aa1f6d674c3
Diffstat (limited to 'framework-t/src')
| -rw-r--r-- | framework-t/src/android/net/NetworkTemplate.java | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/framework-t/src/android/net/NetworkTemplate.java b/framework-t/src/android/net/NetworkTemplate.java index 7dd04c5d42..d85291318f 100644 --- a/framework-t/src/android/net/NetworkTemplate.java +++ b/framework-t/src/android/net/NetworkTemplate.java @@ -560,30 +560,6 @@ public final class NetworkTemplate implements Parcelable { } /** - * Check if the template can be persisted into disk. - * - * @hide - */ - // TODO: Move to the NetworkPolicy. - public boolean isPersistable() { - switch (mMatchRule) { - case MATCH_MOBILE_WILDCARD: - case MATCH_WIFI_WILDCARD: - return false; - case MATCH_CARRIER: - return mSubscriberId != null; - case MATCH_WIFI: - if (Objects.equals(mNetworkId, WIFI_NETWORK_KEY_ALL) - && mSubscriberIdMatchRule == SUBSCRIBER_ID_MATCH_RULE_ALL) { - return false; - } - return true; - default: - return true; - } - } - - /** * Get match rule of the template. See {@code MATCH_*}. */ @UnsupportedAppUsage |