External mutation of full NetworkPolicy set.

Instead of embedding complex template coexistence rules into policy
service, rely on external editors to enforce, and offer atomic
get/set operations for full policy sets.

Generate default mobile policy when none exists, using default of 4GB
warning and cycle reset of current day.  Dispatch listener events
through Handler when holding internal lock, and catch CLASS_UNKNOWN
networks in 3G_LOWER template.

Change-Id: I063cf1eaf330e32b75d0697b89fc04488e6dfaea

1 files changed, 4 insertions, 4 deletions

diff --git a/core/java/android/net/NetworkPolicyManager.java b/core/java/android/net/NetworkPolicyManager.java
index 08b1a81..13ece40 100644
--- a/core/java/android/net/NetworkPolicyManager.java
+++ b/core/java/android/net/NetworkPolicyManager.java
@@ -55,17 +55,17 @@ public class NetworkPolicyManager {
     }
 
     /** {@hide} */
-    public void setNetworkPolicy(int networkType, String subscriberId, NetworkPolicy policy) {
+    public void setNetworkPolicies(NetworkPolicy[] policies) {
         try {
-            mService.setNetworkPolicy(networkType, subscriberId, policy);
+            mService.setNetworkPolicies(policies);
         } catch (RemoteException e) {
         }
     }
 
     /** {@hide} */
-    public NetworkPolicy getNetworkPolicy(int networkType, String subscriberId) {
+    public NetworkPolicy[] getNetworkPolicies() {
         try {
-            return mService.getNetworkPolicy(networkType, subscriberId);
+            return mService.getNetworkPolicies();
         } catch (RemoteException e) {
             return null;
         }