commit 28fe954075f2a0a7ae700809ec83dc898f77f67c
author Neil Fuller <nfuller@google.com> Tue Oct 02 11:55:20 2018 +0100
committer Neil Fuller <nfuller@google.com> Tue Oct 02 12:29:06 2018 +0000
tree c38983e292eb734bd064062ab0d8fb5750056a3f
parent ec65174f118dd6236723add199bdbd8510e63d92

Avoid deprecated PrivateKeyInfo.getAlgorithmId()

Switch from using the PrivateKeyInfo.getAlgorithmId() method to
using the functionally identical PrivateKeyInfo.getPrivateKeyAlgorithm()
method instead.

Bug: 113148576
Test: build only / inspection
Merged-In: Iab2d3b23ad969f683d716cb981e32fd554c67a81
Change-Id: I9ed5c96a20d6749bf75212c0fd820d71ca0a6053

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);