summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2011-06-15 10:36:22 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-06-15 10:36:22 -0700
commit1274f2b46c2c157f0ffc61b7a9e51fd893e9a95f (patch)
tree8c17367e13354c87c9e144da08379f1d50e87154 /core/java
parent0acb8d30117b101be4fc5ac0a800cba1d865e5e4 (diff)
parent14711eb5b6a45b587222ae71c57a381beb7b1a7e (diff)
downloadframeworks_base-1274f2b46c2c157f0ffc61b7a9e51fd893e9a95f.zip
frameworks_base-1274f2b46c2c157f0ffc61b7a9e51fd893e9a95f.tar.gz
frameworks_base-1274f2b46c2c157f0ffc61b7a9e51fd893e9a95f.tar.bz2
Merge "Include template in data warning/limit intents."
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/net/NetworkPolicyManager.java23
1 files changed, 23 insertions, 0 deletions
diff --git a/core/java/android/net/NetworkPolicyManager.java b/core/java/android/net/NetworkPolicyManager.java
index e9d65e6..538a06e 100644
--- a/core/java/android/net/NetworkPolicyManager.java
+++ b/core/java/android/net/NetworkPolicyManager.java
@@ -19,6 +19,7 @@ package android.net;
import static android.text.format.Time.MONTH_DAY;
import android.content.Context;
+import android.content.Intent;
import android.os.RemoteException;
import android.text.format.Time;
@@ -41,6 +42,28 @@ public class NetworkPolicyManager {
/** Reject traffic on paid networks. */
public static final int RULE_REJECT_PAID = 0x1;
+ /**
+ * {@link Intent} action launched when user selects {@link NetworkPolicy}
+ * warning notification.
+ */
+ public static final String ACTION_DATA_USAGE_WARNING =
+ "android.intent.action.DATA_USAGE_WARNING";
+
+ /**
+ * {@link Intent} action launched when user selects {@link NetworkPolicy}
+ * limit notification.
+ */
+ public static final String ACTION_DATA_USAGE_LIMIT =
+ "android.intent.action.DATA_USAGE_LIMIT";
+
+ /**
+ * {@link Intent} extra included in {@link #ACTION_DATA_USAGE_WARNING} and
+ * {@link #ACTION_DATA_USAGE_LIMIT} to indicate which
+ * {@link NetworkPolicy#networkTemplate} it applies to.
+ */
+ public static final String EXTRA_NETWORK_TEMPLATE =
+ "android.intent.extra.NETWORK_TEMPLATE";
+
private INetworkPolicyManager mService;
public NetworkPolicyManager(INetworkPolicyManager service) {