am cd1de394: Merge "Track change in NativeCrypto"

* commit 'cd1de3940d9c389b6e69a7040c67d3abb8458ad2': Track change in NativeCrypto
2013-05-06 15:13:58 -07:00
parent 5f71421354 cd1de3940d
commit 5f851a89b6
1 changed files with 2 additions and 0 deletions
--- a/keystore/java/android/security/KeyChain.java
+++ b/keystore/java/android/security/KeyChain.java
@@ -346,6 +346,8 @@ public final class KeyChain {
            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) {