diff options
| author | Hai Shalom <haishalom@google.com> | 2020-07-23 20:12:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-23 20:12:11 +0000 |
| commit | ae80e463faa006cfe1451a2941da67bc34fd7b0b (patch) | |
| tree | 08cd29d2734540c55f64ea6c1b4ba71632868381 /service | |
| parent | 7f4e4de3d07a35a91aa8f0dfaf7827fadca8e400 (diff) | |
| parent | 9cfa9c4d6928dfb45ce3aa64eb03f1ecae975644 (diff) | |
Merge "[WPA3-Enterprise] Fix connection issues to ECDSA networks" into rvc-dev am: 9cfa9c4d69
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/12213457
Change-Id: I65641e0cb2095678f82f429e0fb93c2ba3dc9451
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) { |