diff options
| author | Hai Shalom <haishalom@google.com> | 2020-07-23 18:32:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-07-23 18:32:38 +0000 |
| commit | 9cfa9c4d6928dfb45ce3aa64eb03f1ecae975644 (patch) | |
| tree | e4a89296e6ea936cc816e667443dd76024bdb7f9 /service | |
| parent | ce1434bcc1bab6c3adc011ae64c5a9e77e2669c9 (diff) | |
| parent | 27e757ab5d4c65462295b1a985eb823a8e1199d1 (diff) | |
Merge "[WPA3-Enterprise] Fix connection issues to ECDSA networks" into rvc-dev
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiKeyStore.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/WifiKeyStore.java b/service/java/com/android/server/wifi/WifiKeyStore.java index d59dd1d47..70daa0d55 100644 --- a/service/java/com/android/server/wifi/WifiKeyStore.java +++ b/service/java/com/android/server/wifi/WifiKeyStore.java @@ -65,7 +65,9 @@ public class WifiKeyStore { // Certificate and private key management for EnterpriseConfig private static boolean needsKeyStore(WifiEnterpriseConfig config) { - return (config.getClientCertificate() != null || config.getCaCertificate() != null); + return (config.getClientCertificate() != null || config.getCaCertificate() != null + || config.getCaCertificateAlias() != null + || config.getClientCertificateAlias() != null); } private static boolean isHardwareBackedKey(Key key) { |