summaryrefslogtreecommitdiff
path: root/core/java/android/net/ConnectivityManager.java
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2010-09-15 19:49:53 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-15 19:49:53 -0700
commit5b7c5e055233154d2a82cc2d084cf983d12bb3a7 (patch)
tree098c91ffe7ea93e74e1b4906cea5f0c2360ec556 /core/java/android/net/ConnectivityManager.java
parent4e0bfd70d090b5653dd00c5a671db0519086dcfe (diff)
parentf434dd1660f222a1ee85e77c98893b90857805c2 (diff)
am f434dd16: am 134b28a7: Merge "Update Inet Connection Status display" into gingerbread
Merge commit 'f434dd1660f222a1ee85e77c98893b90857805c2' * commit 'f434dd1660f222a1ee85e77c98893b90857805c2': Update Inet Connection Status display
Diffstat (limited to 'core/java/android/net/ConnectivityManager.java')
-rw-r--r--core/java/android/net/ConnectivityManager.java11
1 files changed, 11 insertions, 0 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index 61fc9e61ab96..b483f6cfdf1b 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -126,6 +126,17 @@ public class ConnectivityManager
public static final String ACTION_BACKGROUND_DATA_SETTING_CHANGED =
"android.net.conn.BACKGROUND_DATA_SETTING_CHANGED";
+
+ /**
+ * Broadcast Action: The network connection may not be good
+ * uses {@code ConnectivityManager.EXTRA_INET_CONDITION} and
+ * {@code ConnectivityManager.EXTRA_NETWORK_INFO} to specify
+ * the network and it's condition.
+ * @hide
+ */
+ public static final String INET_CONDITION_ACTION =
+ "android.net.conn.INET_CONDITION_ACTION";
+
/**
* Broadcast Action: A tetherable connection has come or gone
* TODO - finish the doc