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

Merge "Avoid deprecated PrivateKeyInfo.getAlgorithmId()" am: a934366a8d

Browse Source 
am: 8caeafdf92

Change-Id: I9dcfcf4414837d32a42abc152a49fb4544ddac80
This commit is contained in:
Neil Fuller
2018-10-03 00:32:10 -07:00
committed by android-build-merger
parent ce939610ba 8caeafdf92
commit eae7538909
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/CredentialStorage.java
View File

@@ -218,7 +218,7 @@ public final class CredentialStorage extends Activity {
try { try {
ASN1InputStream bIn = new ASN1InputStream(new ByteArrayInputStream(keyData)); ASN1InputStream bIn = new ASN1InputStream(new ByteArrayInputStream(keyData));
PrivateKeyInfo pki = PrivateKeyInfo.getInstance(bIn.readObject()); PrivateKeyInfo pki = PrivateKeyInfo.getInstance(bIn.readObject());
String algOid = pki.getAlgorithmId().getAlgorithm().getId(); String algOid = pki.getPrivateKeyAlgorithm().getAlgorithm().getId();
String algName = new AlgorithmId(new ObjectIdentifier(algOid)).getName(); String algName = new AlgorithmId(new ObjectIdentifier(algOid)).getName();
return KeyChain.isBoundKeyAlgorithm(algName); return KeyChain.isBoundKeyAlgorithm(algName);