summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuang Luong <qal@google.com>2020-06-04 16:59:35 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-04 16:59:35 +0000
commit5324acab367b33a54f313d71b8f935285a3aa375 (patch)
tree899d06bb9d88aad6c0585148857a5b78bfaa9d7c
parentbf34282befbbced3eac590d705afc9f469da88ae (diff)
parent9dadaed712f71eba424cb75d2921d72d76f15391 (diff)
Merge "[WifiTrackerLib] Settings APP crashes after clicking a Passpoint2.0 Wi-Fi network twice" into rvc-dev
-rw-r--r--libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiPickerTracker.java7
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;