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