Merge "Track change in NativeCrypto"

2013-05-06 22:02:20 +00:00
parent 601afaef52 4b30e3391b
commit cd1de3940d
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) {