diff options
| author | Quang Luong <qal@google.com> | 2023-11-08 04:43:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-11-08 04:43:04 +0000 |
| commit | cc5dcf59073c57fedb4fcb3e7d9f4a531c751cdd (patch) | |
| tree | 3f1c8d63ef545a69679900391d9fe7bef28bde64 | |
| parent | 6b4e6d40221192bc5fbb545bd6a18cb6e168a93a (diff) | |
| parent | 20470ff173b194ed3ae9d0351048c846a2f33201 (diff) | |
| download | wifi-cc5dcf59073c57fedb4fcb3e7d9f4a531c751cdd.tar.gz | |
Merge "Fix WifiEntry.isDefaultNetwork() returning true when disconnected" into main
| -rw-r--r-- | libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java | 3 | ||||
| -rw-r--r-- | libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/WifiPickerTrackerTest.java | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java index d15c44fd6..8c78e81f7 100644 --- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java +++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java @@ -57,7 +57,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.Comparator; import java.util.List; -import java.util.Objects; import java.util.Optional; import java.util.StringJoiner; import java.util.stream.Collectors; @@ -369,7 +368,7 @@ public class WifiEntry { * currently being used to provide internet connection). */ public boolean isDefaultNetwork() { - return Objects.equals(mNetwork, mDefaultNetwork); + return mNetwork != null && mNetwork.equals(mDefaultNetwork); } /** diff --git a/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/WifiPickerTrackerTest.java b/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/WifiPickerTrackerTest.java index 1d95568d0..dcb594fd1 100644 --- a/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/WifiPickerTrackerTest.java +++ b/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/WifiPickerTrackerTest.java @@ -918,6 +918,10 @@ public class WifiPickerTrackerTest { // Lose the default network mDefaultNetworkCallbackCaptor.getValue().onLost(mock(Network.class)); assertThat(wifiPickerTracker.getConnectedWifiEntry().isDefaultNetwork()).isFalse(); + + // Disconnect + mNetworkCallbackCaptor.getValue().onLost(mMockNetwork); + assertThat(wifiPickerTracker.getWifiEntries().get(0).isDefaultNetwork()).isFalse(); } /** |