diff options
| author | Quang Luong <qal@google.com> | 2020-06-04 17:22:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-04 17:22:36 +0000 |
| commit | c95d96accd50c726df2fc496897076849104950c (patch) | |
| tree | 1bfdf8a80c07974d91fd50bd6c4c4fae5b986892 | |
| parent | 8609c1446ad3ef7be12d1232137ed20ffd2bce18 (diff) | |
| parent | 2b1a366cd207dde5a2001806eddd0dbad43fe342 (diff) | |
Merge "[WifiTrackerLib] Settings APP crashes after clicking a Passpoint2.0 Wi-Fi network twice" into rvc-dev am: 5324acab36 am: 2b1a366cd2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/11707065
Change-Id: I71720df2e3ee53c1df481115090774d5d6ca7bba
| -rw-r--r-- | libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiPickerTracker.java | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiPickerTracker.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiPickerTracker.java index 170dd4ecd..751e8b9b7 100644 --- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiPickerTracker.java +++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiPickerTracker.java @@ -319,13 +319,6 @@ public class WifiPickerTracker extends BaseWifiTracker { || connectedState == CONNECTED_STATE_CONNECTING; }).findAny().orElse(null /* other */); } - if (mConnectedWifiEntry == null) { - mConnectedWifiEntry = mOsuWifiEntryCache.values().stream().filter(entry -> { - final @WifiEntry.ConnectedState int connectedState = entry.getConnectedState(); - return connectedState == CONNECTED_STATE_CONNECTED - || connectedState == CONNECTED_STATE_CONNECTING; - }).findAny().orElse(null /* other */); - } if (mConnectedWifiEntry == null && mNetworkRequestEntry != null && mNetworkRequestEntry.getConnectedState() != CONNECTED_STATE_DISCONNECTED) { mConnectedWifiEntry = mNetworkRequestEntry; |