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

Commit 81d8ff89 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix Wifi state not updated while connecting" into rvc-dev am:... 

Merge "Fix Wifi state not updated while connecting" into rvc-dev am: a8e80822 am: 91374908 am: 101ded7a am: 11c8f7c5

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11803411

Change-Id: Ib266ef60d05034a9665e963c1a5598fef13c4b0f
parents fe81293c 11c8f7c5

packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java

+2 −4
Original line number Diff line number Diff line
@@ -900,9 +900,7 @@ public class WifiTracker implements LifecycleObserver, OnStart, OnStop, OnDestro 
                updateNetworkInfo(info);

                fetchScansAndConfigsAndUpdateAccessPoints();

            } else if (WifiManager.RSSI_CHANGED_ACTION.equals(action)) {

                NetworkInfo info =

                        mConnectivityManager.getNetworkInfo(mWifiManager.getCurrentNetwork());

                updateNetworkInfo(info);

                updateNetworkInfo(/* networkInfo= */ null);

            }

        }

    };
@@ -948,7 +946,7 @@ public class WifiTracker implements LifecycleObserver, OnStart, OnStop, OnDestro 
                // We don't send a NetworkInfo object along with this message, because even if we

                // fetch one from ConnectivityManager, it might be older than the most recent

                // NetworkInfo message we got via a WIFI_STATE_CHANGED broadcast.

                updateNetworkInfo(null);

                updateNetworkInfo(/* networkInfo= */ null);

            }

        }

    }