From be7e160abefe01b1ee92ff25bc389f7284c068cb Mon Sep 17 00:00:00 2001 From: Erik Kline Date: Tue, 21 Apr 2015 15:20:58 +0900 Subject: [PATCH] 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 --- core/java/android/net/ConnectivityManager.java | 10 ---------- .../java/com/android/server/ConnectivityService.java | 5 ----- 2 files changed, 15 deletions(-) diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 7b758bb80f..6359f084eb 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -99,16 +99,6 @@ public class ConnectivityManager { @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) 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 diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index ffda5a7403..64a924a8a0 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -19,7 +19,6 @@ package com.android.server; import static android.Manifest.permission.MANAGE_NETWORK_POLICY; import static android.Manifest.permission.RECEIVE_DATA_ACTIVITY_CHANGE; import static android.net.ConnectivityManager.CONNECTIVITY_ACTION; -import static android.net.ConnectivityManager.CONNECTIVITY_ACTION_IMMEDIATE; import static android.net.ConnectivityManager.NETID_UNSET; import static android.net.ConnectivityManager.TYPE_NONE; import static android.net.ConnectivityManager.TYPE_VPN; @@ -1368,7 +1367,6 @@ public class ConnectivityService extends IConnectivityManager.Stub public void sendConnectedBroadcast(NetworkInfo info) { enforceConnectivityInternalPermission(); - sendGeneralBroadcast(info, CONNECTIVITY_ACTION_IMMEDIATE); sendGeneralBroadcast(info, CONNECTIVITY_ACTION); } @@ -4203,9 +4201,6 @@ public class ConnectivityService extends IConnectivityManager.Stub } intent.putExtra(ConnectivityManager.EXTRA_INET_CONDITION, mDefaultInetConditionPublished); - final Intent immediateIntent = new Intent(intent); - immediateIntent.setAction(CONNECTIVITY_ACTION_IMMEDIATE); - sendStickyBroadcast(immediateIntent); sendStickyBroadcast(intent); if (newDefaultAgent != null) { sendConnectedBroadcast(newDefaultAgent.networkInfo);