diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-07-23 23:04:34 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-07-23 23:04:34 +0000 |
| commit | 6295916af26c0726a5ab969647cc6d11386f8b67 (patch) | |
| tree | e4a89296e6ea936cc816e667443dd76024bdb7f9 /service | |
| parent | 1ec423fa5ec67a78f91287e49a4d76a76a3d0289 (diff) | |
| parent | 41a7999299a1c84652fbeddf98edb863e82aabf6 (diff) | |
Merge cherrypicks of [12222001, 12222002, 12222003, 12221903, 12221710, 12221711, 12221712, 12221713, 12221714, 12221715, 12221922] into rvc-release
Change-Id: I5d22e8a6b74e0f6e77e5dcd88e7c65985b1f20c4
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) { |