diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-01-10 17:02:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-01-10 17:02:38 +0000 |
| commit | 013708287ef5f82f936207b849d294cdbb14d8b2 (patch) | |
| tree | cda499fc754d7692f2265b37b88cdbd54a814d76 /service | |
| parent | dfc4219e2d230cdce654c26aed3680fece04ddb5 (diff) | |
| parent | ce6f8e9530c34bc871e46e025ca671ecb2c04ef3 (diff) | |
Merge "Fix 802.1x check for needsUnlockedKeyStore()"
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiConfigManager.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java index 5e29c4399..a4ae5657b 100644 --- a/service/java/com/android/server/wifi/WifiConfigManager.java +++ b/service/java/com/android/server/wifi/WifiConfigManager.java @@ -2254,8 +2254,7 @@ public class WifiConfigManager { */ public boolean needsUnlockedKeyStore() { for (WifiConfiguration config : getInternalConfiguredNetworks()) { - if (config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.WPA_EAP) - && config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.IEEE8021X)) { + if (WifiConfigurationUtil.isConfigForEapNetwork(config)) { if (mWifiKeyStore.needsSoftwareBackedKeyStore(config.enterpriseConfig)) { return true; } |