summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2013-02-20 18:21:19 -0800
committerJeff Sharkey <jsharkey@android.com>2013-02-21 09:47:11 -0800
commit4fa63b2d5e3b2e2a85bf17a9bf056cbdfb7046f0 (patch)
tree974d799412098de464ddc8ded7929c38fe86f136 /core/java/android
parentec6156f9e884ba85c76a9c4683f83f18b3f64afa (diff)
Improve notification UI for lockdown VPN.
Bug: 7064111 Change-Id: I9554f6a426697b4abeb2ddd0827d314920e88ed6
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/net/ConnectivityManager.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index 000c56c3a443..1f44e49f2eaf 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -70,6 +70,7 @@ public class ConnectivityManager {
* For a disconnect event, the boolean extra EXTRA_NO_CONNECTIVITY
* is set to {@code true} if there are no connected networks at all.
*/
+ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String CONNECTIVITY_ACTION = "android.net.conn.CONNECTIVITY_CHANGE";
/**
@@ -78,6 +79,7 @@ public class ConnectivityManager {
*
* @hide
*/
+ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String CONNECTIVITY_ACTION_IMMEDIATE =
"android.net.conn.CONNECTIVITY_CHANGE_IMMEDIATE";
@@ -198,6 +200,7 @@ public class ConnectivityManager {
* the network and it's condition.
* @hide
*/
+ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String INET_CONDITION_ACTION =
"android.net.conn.INET_CONDITION_ACTION";
@@ -206,6 +209,7 @@ public class ConnectivityManager {
* TODO - finish the doc
* @hide
*/
+ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_TETHER_STATE_CHANGED =
"android.net.conn.TETHER_STATE_CHANGED";
@@ -233,6 +237,7 @@ public class ConnectivityManager {
* notification.
* @hide
*/
+ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_CAPTIVE_PORTAL_TEST_COMPLETED =
"android.net.conn.CAPTIVE_PORTAL_TEST_COMPLETED";
/**