summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2013-05-06 22:02:20 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-05-06 22:02:20 +0000
commitcd1de3940d9c389b6e69a7040c67d3abb8458ad2 (patch)
tree1d13b5bc0dc565e45e7e0998d857dd5114d69653
parent601afaef5220aef928a9235e50376c462538a942 (diff)
parent4b30e3391bda250975b43af43bad58c98fa73f84 (diff)
downloadbase-tools_r22.tar.gz
Merge "Track change in NativeCrypto"tools_r22
-rw-r--r--keystore/java/android/security/KeyChain.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/keystore/java/android/security/KeyChain.java b/keystore/java/android/security/KeyChain.java
index 825a06272357..0ad4d0752875 100644
--- 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) {