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

Merge "Keystore 2.0: Remove references to Keystore 1.0" am: 7aa99fe966 am: c90b511239

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

Change-Id: I590f53d3a4c1b6ad9c4bdb27f04103ccfba7e7af
This commit is contained in:
Janis Danisevskis
2021-03-23 04:09:47 +00:00
committed by Automerger Merge Worker
parent 8722e00b4a c90b511239
commit a308ea1915
2 changed files with 15 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,8 +16,6 @@
package com.android.settings.utils;
import android.os.Process;
import android.security.keystore.AndroidKeyStoreProvider;
import android.security.keystore.KeyProperties;
import android.security.keystore2.AndroidKeyStoreLoadStoreParameter;
import android.util.Log;
@@ -41,6 +39,8 @@ import java.util.Enumeration;
public class AndroidKeystoreAliasLoader {
private static final String TAG = "SettingsKeystoreUtils";
private static final String KEYSTORE_PROVIDER = "AndroidKeyStore";
private final Collection<String> mKeyCertAliases;
private final Collection<String> mCaCertAliases;
/**
@@ -58,21 +58,13 @@ public class AndroidKeystoreAliasLoader {
public AndroidKeystoreAliasLoader(Integer namespace) {
mKeyCertAliases = new ArrayList<>();
mCaCertAliases = new ArrayList<>();
KeyStore keyStore = null;
final KeyStore keyStore;
final Enumeration<String> aliases;
try {
keyStore = KeyStore.getInstance(KEYSTORE_PROVIDER);
if (namespace != null && namespace != KeyProperties.NAMESPACE_APPLICATION) {
if (AndroidKeyStoreProvider.isKeystore2Enabled()) {
keyStore = KeyStore.getInstance("AndroidKeyStore");
keyStore.load(new AndroidKeyStoreLoadStoreParameter(namespace));
} else {
// In the legacy case we pass in the WIFI UID because that is the only
// possible special namespace that existed as of this writing,
// and new namespaces must only be added using the new mechanism.
keyStore = AndroidKeyStoreProvider.getKeyStoreForUid(Process.WIFI_UID);
}
keyStore.load(new AndroidKeyStoreLoadStoreParameter(namespace));
} else {
keyStore = KeyStore.getInstance("AndroidKeyStore");
keyStore.load(null);
}
aliases = keyStore.aliases();