commit 8caeafdf925f06d5eb9bb45a51d721dbf19fb02f
author Neil Fuller <nfuller@google.com> Wed Oct 03 00:26:56 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 03 00:26:56 2018 -0700
tree b27f43f42037577c5259f836aa4902267689e783
parent 09dcb8798224bffb4ef090b3fea32824321195bc
parent a934366a8d692a8ff5ef156087a0df7c655b7577

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

Change-Id: If44a79fde1e2694dc24d09cbf889771facef751f

src/com/android/settings/CredentialStorage.java

diff --git a/src/com/android/settings/CredentialStorage.java b/src/com/android/settings/CredentialStorage.java
index ffbd2ce..0a559c2 100644
--- a/src/com/android/settings/CredentialStorage.java
+++ b/src/com/android/settings/CredentialStorage.java
@@ -218,7 +218,7 @@
         try {
             ASN1InputStream bIn = new ASN1InputStream(new ByteArrayInputStream(keyData));
             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();
 
             return KeyChain.isBoundKeyAlgorithm(algName);