PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Keystore 2.0: Make Legacy VPN settings ready for Keystore 2.0" am: 3c7b085331 am: bae6535b75

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1569702

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4395ebf453fd712d9870580a90c370b42a770d7a
This commit is contained in:
Janis Danisevskis
2021-03-05 05:41:50 +00:00
committed by Automerger Merge Worker
parent cc1715e2c0 bae6535b75
commit bb5ebce8a0
5 changed files with 44 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/utils/AndroidKeystoreAliasLoader.java
View File

@@ -28,6 +28,7 @@ import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
import java.security.PrivateKey;
import java.security.UnrecoverableKeyException;
import java.security.cert.Certificate;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Enumeration;
@@ -88,6 +89,10 @@ public class AndroidKeystoreAliasLoader {
if (key != null) {
if (key instanceof PrivateKey) {
mKeyCertAliases.add(alias);
final Certificate[] cert = keyStore.getCertificateChain(alias);
if (cert != null && cert.length >= 2) {
mCaCertAliases.add(alias);
}
}
} else {
if (keyStore.getCertificate(alias) != null) {