Merge "Refine fix I53e91db7 to apply only to wifi network" into eclair (5381e4ef) · Commits · e / os / android_frameworks_base

services/java/com/android/server/ConnectivityService.java

+9 −2

Original line number	Diff line number	Diff line
		@@ -1269,9 +1269,16 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		info = (NetworkInfo) msg.obj;
		int type = info.getType();
		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) {
		// 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 " +
		info.getTypeName() + ": " +
		state + "/" + info.getDetailedState());