diff options
| author | Quang Anh Luong <qal@google.com> | 2023-11-07 08:29:20 +0900 |
|---|---|---|
| committer | Quang Anh Luong <qal@google.com> | 2023-11-07 08:31:06 +0900 |
| commit | 20470ff173b194ed3ae9d0351048c846a2f33201 (patch) | |
| tree | 2ebe47acf0106d5156da746d93c13a4403d8ca7c | |
| parent | cb76f88d9bf3ef23d2a27ea0c36e94950662517e (diff) | |
| download | wifi-20470ff173b194ed3ae9d0351048c846a2f33201.tar.gz | |
Fix WifiEntry.isDefaultNetwork() returning true when disconnected
Fix the check in isDefaultNetwork() returning true when both mNetwork
and mDefaultNetwork are null.
Bug: 309058001
Test: atest WifiTrackerLibTests
Change-Id: Ic39b311045735b2df73c5a502e9a06ef12835626
| -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 932b3a0bb..ba02d4a44 100644 --- a/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/WifiPickerTrackerTest.java +++ b/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/WifiPickerTrackerTest.java @@ -903,6 +903,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(); } /** |