commit cfba6a07fd24559bfb6bb51007520b8ca3cd5c48
author Kenny Root <kroot@google.com> Mon May 06 15:00:58 2013 -0700
committer Brian Carlstrom <bdc@google.com> Tue May 07 00:44:18 2013 -0700
tree f90b6992d6e83ed32089aaebbc6b6ef439c90c4a
parent 26ef95f0c1506618d4e4ff5ccb7daf810ae6b862

Track change in NativeCrypto

(cherry picked from commit 4b30e3391bda250975b43af43bad58c98fa73f84)

Change-Id: I9eed3895d78c6906f7d29d325075cf1df48fd123

keystore/java/android/security/KeyChain.java

diff --git a/keystore/java/android/security/KeyChain.java b/keystore/java/android/security/KeyChain.java
index 6c10287..328ac5d 100644
--- a/keystore/java/android/security/KeyChain.java
+++ b/keystore/java/android/security/KeyChain.java
@@ -346,6 +346,8 @@
             List<X509Certificate> chain = store
                     .getCertificateChain(toCertificate(certificateBytes));
             return chain.toArray(new X509Certificate[chain.size()]);
+        } catch (CertificateException e) {
+            throw new KeyChainException(e);
         } catch (RemoteException e) {
             throw new KeyChainException(e);
         } catch (RuntimeException e) {