Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64fe5646 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android Git Automerger
Browse files

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

Merge commit '6d626d41'

* commit '6d626d41':
  Refine fix I53e91db7 to apply only to wifi network
parents e7d9ba24 6d626d41

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

+9 −2
Original line number Diff line number Diff line
@@ -1280,9 +1280,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());