diff options
| author | Erik Kline <ek@google.com> | 2015-04-21 15:20:58 +0900 |
|---|---|---|
| committer | Erik Kline <ek@google.com> | 2015-04-22 08:56:43 +0900 |
| commit | 2625befbb182bbadb3b71f77e3b83e6c105576ae (patch) | |
| tree | 8cc07c32abd970c4be7d4ca19f9536abfaa94399 /core | |
| parent | 83cda0057a83521642e99e538daeba2f8544da15 (diff) | |
| download | frameworks_base-2625befbb182bbadb3b71f77e3b83e6c105576ae.zip frameworks_base-2625befbb182bbadb3b71f77e3b83e6c105576ae.tar.gz frameworks_base-2625befbb182bbadb3b71f77e3b83e6c105576ae.tar.bz2 | |
Final removal of CONNECTIVITY_ACTION_IMMEDIATE.
Since the demise of the connectivity change delay,
CONNECTIVITY_ACTION_IMMEDIATE has been sent out back to back with
CONNECTIVITY_ACTION.
Interested parties should watch for CONNECTIVITY_ACTION.
Bug: 20013379
Change-Id: I072dddf95adb3bbd17fa1f7159d4ea848ade8f19
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/net/ConnectivityManager.java | 10 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 1 |
2 files changed, 1 insertions, 10 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 7b758bb..6359f08 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -100,16 +100,6 @@ public class ConnectivityManager { public static final String CONNECTIVITY_ACTION = "android.net.conn.CONNECTIVITY_CHANGE"; /** - * Identical to {@link #CONNECTIVITY_ACTION} broadcast, but sent without any - * historic {@link Settings.Global#CONNECTIVITY_CHANGE_DELAY}. - * - * @hide - */ - @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) - public static final String CONNECTIVITY_ACTION_IMMEDIATE = - "android.net.conn.CONNECTIVITY_CHANGE_IMMEDIATE"; - - /** * The device has connected to a network that has presented a captive * portal, which is blocking Internet connectivity. The user was presented * with a notification that network sign in is required, diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index ed21e80..6c1c352 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -210,6 +210,7 @@ <protected-broadcast android:name="android.net.conn.CAPTIVE_PORTAL" /> <protected-broadcast android:name="android.net.conn.CONNECTIVITY_CHANGE" /> + <!-- @deprecated. Only {@link android.net.ConnectivityManager.CONNECTIVITY_ACTION} is sent. --> <protected-broadcast android:name="android.net.conn.CONNECTIVITY_CHANGE_IMMEDIATE" /> <protected-broadcast android:name="android.net.conn.DATA_ACTIVITY_CHANGE" /> <protected-broadcast android:name="android.net.conn.BACKGROUND_DATA_SETTING_CHANGED" /> |