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

Commit 91374908 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: a8e80822 

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

Change-Id: If3e540bcfd6c35545d4dbdf7d67960f5b97f933f
parents 9fb51021 a8e80822

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

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

                updateNetworkInfo(info);

                fetchScansAndConfigsAndUpdateAccessPoints();

                fetchScansAndConfigsAndUpdateAccessPoints();

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

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

                NetworkInfo info =

                updateNetworkInfo(/* networkInfo= */ null);

                        mConnectivityManager.getNetworkInfo(mWifiManager.getCurrentNetwork());

                updateNetworkInfo(info);

            }

            }

        }

        }

    };

    };
@@ -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

                // 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

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

                // NetworkInfo message we got via a WIFI_STATE_CHANGED broadcast.

                // NetworkInfo message we got via a WIFI_STATE_CHANGED broadcast.

                updateNetworkInfo(null);

                updateNetworkInfo(/* networkInfo= */ null);

            }

            }

        }

        }

    }

    }