am 0070ee42: am 5381e4ef: Merge "Refine fix I53e91db7 to apply only to wifi network" into eclair

Merge commit '0070ee42201c3d1c005828234ece3e25e620dcc9'

* commit '0070ee42201c3d1c005828234ece3e25e620dcc9':
  Refine fix I53e91db7 to apply only to wifi network
This commit is contained in:
Robert Greenwalt
2010-01-28 13:44:45 -08:00
committed by Android Git Automerger

View File

@@ -1280,9 +1280,16 @@ public class ConnectivityService extends IConnectivityManager.Stub {
info = (NetworkInfo) msg.obj; info = (NetworkInfo) msg.obj;
int type = info.getType(); int type = info.getType();
NetworkInfo.State state = info.getState(); NetworkInfo.State state = info.getState();
if (mNetAttributes[type].mLastState == state) { // only do this optimization for wifi. It going into scan mode for location
// services generates alot of noise. Meanwhile the mms apn won't send out
// subsequent notifications when on default cellular because it never
// disconnects.. so only do this to wifi notifications. Fixed better when the
// APN notifications are standardized.
if (mNetAttributes[type].mLastState == state &&
mNetAttributes[type].mRadio == ConnectivityManager.TYPE_WIFI) {
if (DBG) { if (DBG) {
// TODO - remove this after we validate the dropping doesn't break anything // TODO - remove this after we validate the dropping doesn't break
// anything
Log.d(TAG, "Dropping ConnectivityChange for " + Log.d(TAG, "Dropping ConnectivityChange for " +
info.getTypeName() + ": " + info.getTypeName() + ": " +
state + "/" + info.getDetailedState()); state + "/" + info.getDetailedState());