diff options
| author | Les Lee <lesl@google.com> | 2020-02-21 06:07:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-02-21 06:07:13 +0000 |
| commit | f17ae57eac419d42b290c9b8589693b6dcd387ae (patch) | |
| tree | 005aa4360ee01deee4090a5ed5d4c1dc749d386b /service | |
| parent | 539f8d3aa6b5014c6772c96454e00623c0d82754 (diff) | |
| parent | ef698cf9d70d64aa4f8a952f953f81baffccb6a2 (diff) | |
Merge changes from topic "softap_feature_set"
* changes:
wifi: fix a bug in the ApConfigUtil.checkConfigurationChangeNeedToRestart()
wifi: Use long to replace int for softap feature set
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/util/ApConfigUtil.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/util/ApConfigUtil.java b/service/java/com/android/server/wifi/util/ApConfigUtil.java index 6cc8fdba9..bf319b4f2 100644 --- a/service/java/com/android/server/wifi/util/ApConfigUtil.java +++ b/service/java/com/android/server/wifi/util/ApConfigUtil.java @@ -464,7 +464,7 @@ public class ApConfigUtil { */ @NonNull public static SoftApCapability updateCapabilityFromResource(@NonNull Context context) { - int features = 0; + long features = 0; if (isAcsSupported(context)) { Log.d(TAG, "Update Softap capability, add acs feature support"); features |= SoftApCapability.SOFTAP_FEATURE_ACS_OFFLOAD; @@ -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() |