commit cd1de3940d9c389b6e69a7040c67d3abb8458ad2
author Kenny Root <kroot@google.com> Mon May 06 22:02:20 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon May 06 22:02:20 2013 +0000
tree 1d13b5bc0dc565e45e7e0998d857dd5114d69653
parent 601afaef5220aef928a9235e50376c462538a942
parent 4b30e3391bda250975b43af43bad58c98fa73f84

Merge "Track change in NativeCrypto"

keystore/java/android/security/KeyChain.java

diff --git a/keystore/java/android/security/KeyChain.java b/keystore/java/android/security/KeyChain.java
index 825a062..0ad4d075 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) {