summaryrefslogtreecommitdiffstats
path: root/service/java/com/android/server/wifi/WifiConfigManager.java
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-01-13 16:15:06 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-01-13 16:15:06 +0000
commit89d99441cfa62851c10873b946d9554c329fc1f1 (patch)
treefb87999500b78d48e7d8a0f2b4966482480bb04f /service/java/com/android/server/wifi/WifiConfigManager.java
parent63da3825d91eef8d21d694d0ccb7f4687f66e297 (diff)
parent16c9089b483a754475d770a14bd25e8417d83e74 (diff)
downloadandroid_frameworks_opt_net_wifi-89d99441cfa62851c10873b946d9554c329fc1f1.tar.gz
android_frameworks_opt_net_wifi-89d99441cfa62851c10873b946d9554c329fc1f1.tar.bz2
android_frameworks_opt_net_wifi-89d99441cfa62851c10873b946d9554c329fc1f1.zip
Merge "[WPA3] Rename allowedGroupMgmtCiphers to allowedGroupManagementCiphers"
Diffstat (limited to 'service/java/com/android/server/wifi/WifiConfigManager.java')
-rw-r--r--service/java/com/android/server/wifi/WifiConfigManager.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java
index 849f104e2..59adadf69 100644
--- a/service/java/com/android/server/wifi/WifiConfigManager.java
+++ b/service/java/com/android/server/wifi/WifiConfigManager.java
@@ -898,10 +898,10 @@ public class WifiConfigManager {
internalConfig.allowedGroupCiphers =
(BitSet) externalConfig.allowedGroupCiphers.clone();
}
- if (externalConfig.allowedGroupMgmtCiphers != null
- && !externalConfig.allowedGroupMgmtCiphers.isEmpty()) {
- internalConfig.allowedGroupMgmtCiphers =
- (BitSet) externalConfig.allowedGroupMgmtCiphers.clone();
+ if (externalConfig.allowedGroupManagementCiphers != null
+ && !externalConfig.allowedGroupManagementCiphers.isEmpty()) {
+ internalConfig.allowedGroupManagementCiphers =
+ (BitSet) externalConfig.allowedGroupManagementCiphers.clone();
}
if (externalConfig.allowedSuiteBCiphers != null
&& !externalConfig.allowedSuiteBCiphers.isEmpty()) {