From b5c286a4a48605276901f7e0807ca1abeab0ba35 Mon Sep 17 00:00:00 2001 From: Hai Shalom Date: Thu, 10 Jan 2019 12:42:46 -0800 Subject: [PATCH] [WPA3] Rename allowedGroupMgmtCiphers to allowedGroupManagementCiphers Following API Council review: Rename allowedGroupMgmtCiphers to allowedGroupManagementCiphers in all instances in order to be consistend with existing members. Bug: 122616519 Test: atest com.android.server.wifi Change-Id: I42496a0c9fa1034beffd9b05eeafd2f0a75eb1a8 --- src/com/android/settings/wifi/WifiConfigController.java | 2 +- src/com/android/settings/wifi/WifiUtils.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java index 67f59ea5de3..26db583601a 100644 --- a/src/com/android/settings/wifi/WifiConfigController.java +++ b/src/com/android/settings/wifi/WifiConfigController.java @@ -621,7 +621,7 @@ public class WifiConfigController implements TextWatcher, config.requirePMF = true; config.allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.GCMP_256); config.allowedGroupCiphers.set(WifiConfiguration.GroupCipher.GCMP_256); - config.allowedGroupMgmtCiphers.set(WifiConfiguration.GroupMgmtCipher + config.allowedGroupManagementCiphers.set(WifiConfiguration.GroupMgmtCipher .BIP_GMAC_256); config.allowedSuiteBCiphers.set(WifiConfiguration.SuiteBCipher.ECDHE_RSA); } diff --git a/src/com/android/settings/wifi/WifiUtils.java b/src/com/android/settings/wifi/WifiUtils.java index 7970b2a6edd..751fc9176d3 100644 --- a/src/com/android/settings/wifi/WifiUtils.java +++ b/src/com/android/settings/wifi/WifiUtils.java @@ -196,7 +196,7 @@ public class WifiUtils { config.requirePMF = true; config.allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.GCMP_256); config.allowedGroupCiphers.set(WifiConfiguration.GroupCipher.GCMP_256); - config.allowedGroupMgmtCiphers.set(WifiConfiguration.GroupMgmtCipher + config.allowedGroupManagementCiphers.set(WifiConfiguration.GroupMgmtCipher .BIP_GMAC_256); config.allowedSuiteBCiphers.set(WifiConfiguration.SuiteBCipher.ECDHE_RSA); }