Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix Wifi state not updated while connecting" into rvc-dev am: a8e808221e am: 9137490889 am: 101ded7ac6

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

Change-Id: I31a8f61c423b108da14d2ea9d2fe4b5e804556d4
This commit is contained in:
TreeHugger Robot
2020-06-09 22:13:41 +00:00
committed by Automerger Merge Worker
parent 4ec7bbb912 101ded7ac6
commit 11c8f7c5a6
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java
View File

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