From d3401f9b40e4f3f88e1cf9cbb7fb30070070f04d Mon Sep 17 00:00:00 2001 From: Robert Greenwalt Date: Wed, 15 Sep 2010 17:36:33 -0700 Subject: [PATCH] Update Inet Connection Status display Cellular signal strength should also be green - these assets aren't, but the art guys are working on that. Also using a new intent so we don't overload the CONNECTIVITY_ACTION and confuse the apps. bug:2994024 Change-Id: I6fe8f65dd6e9869d9724064c4fae45340491a4d8 --- core/java/android/net/ConnectivityManager.java | 11 +++++++++++ .../java/com/android/server/ConnectivityService.java | 12 ++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 331ce10a64..39681912de 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -123,6 +123,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 diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index 9784d96aed..c5505d1139 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -1008,7 +1008,15 @@ public class ConnectivityService extends IConnectivityManager.Stub { } private void sendConnectedBroadcast(NetworkInfo info) { - Intent intent = new Intent(ConnectivityManager.CONNECTIVITY_ACTION); + sendGeneralBroadcast(info, ConnectivityManager.CONNECTIVITY_ACTION); + } + + private void sendInetConditionBroadcast(NetworkInfo info) { + sendGeneralBroadcast(info, ConnectivityManager.INET_CONDITION_ACTION); + } + + private void sendGeneralBroadcast(NetworkInfo info, String bcastType) { + Intent intent = new Intent(bcastType); intent.putExtra(ConnectivityManager.EXTRA_NETWORK_INFO, info); if (info.isFailover()) { intent.putExtra(ConnectivityManager.EXTRA_IS_FAILOVER, true); @@ -1512,7 +1520,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { break; } mDefaultInetConditionPublished = mDefaultInetCondition; - sendConnectedBroadcast(networkInfo); + sendInetConditionBroadcast(networkInfo); break; } }