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

Commit 11c8f7c5 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

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

Change-Id: I31a8f61c423b108da14d2ea9d2fe4b5e804556d4
parents 4ec7bbb9 101ded7a

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);

            }

        }

    }