summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorlesl <lesl@google.com>2020-02-20 18:51:22 +0800
committerlesl <lesl@google.com>2020-02-20 19:24:19 +0800
commitef698cf9d70d64aa4f8a952f953f81baffccb6a2 (patch)
tree4ce7747c69348afcb43b30249adb32e4426fdeba /service
parent162424ec2c9f0cfcb05c3225c8d8b54bdb70446a (diff)
wifi: fix a bug in the ApConfigUtil.checkConfigurationChangeNeedToRestart()
The bssid was checking for object instance equality. And add unit test to covert the test. Bug: 147779354 Test: atest FrameworksWifiTests Change-Id: I354d2d7f53e4e0f3ba572dc229983e66ad598e08
Diffstat (limited to 'service')
-rw-r--r--service/java/com/android/server/wifi/util/ApConfigUtil.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/util/ApConfigUtil.java b/service/java/com/android/server/wifi/util/ApConfigUtil.java
index e5b5037c8..bf319b4f2 100644
--- a/service/java/com/android/server/wifi/util/ApConfigUtil.java
+++ b/service/java/com/android/server/wifi/util/ApConfigUtil.java
@@ -534,7 +534,7 @@ public class ApConfigUtil {
public static boolean checkConfigurationChangeNeedToRestart(
SoftApConfiguration currentConfig, SoftApConfiguration newConfig) {
return !Objects.equals(currentConfig.getSsid(), newConfig.getSsid())
- || currentConfig.getBssid() != newConfig.getBssid()
+ || !Objects.equals(currentConfig.getBssid(), newConfig.getBssid())
|| currentConfig.getSecurityType() != newConfig.getSecurityType()
|| !Objects.equals(currentConfig.getPassphrase(), newConfig.getPassphrase())
|| currentConfig.isHiddenSsid() != newConfig.isHiddenSsid()