commit b6d02f2cc0f5343f77124738d8e3a35e186365db
author Treehugger Robot <treehugger-gerrit@google.com> Tue Dec 21 16:09:25 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 21 16:09:25 2021 +0000
tree 5a0caf448d5dacb4122bca6334d8ebd46c797347
parent 6609167efe943b7831241bf0274ee2cd9abbe3a1
parent 682bebbf6065a83681782b70e323830829761e68

Merge "[MS14] Move isPersistable to NetworkPolicy"

framework-t/src/android/net/NetworkTemplate.java

diff --git a/framework-t/src/android/net/NetworkTemplate.java b/framework-t/src/android/net/NetworkTemplate.java
index 7dd04c5..d852913 100644
--- a/framework-t/src/android/net/NetworkTemplate.java
+++ b/framework-t/src/android/net/NetworkTemplate.java
@@ -560,30 +560,6 @@
     }
 
     /**
-     * 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