diff options
| author | Kenny Root <kroot@google.com> | 2013-05-06 15:13:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-06 15:13:58 -0700 |
| commit | 5f851a89b6a90db206d0e2fa63a60229e2bfcda6 (patch) | |
| tree | 96606b9c3ca3682b890284276b81ac6cfa429617 /keystore/java | |
| parent | 5f714213546d667ac241a92e2052b30dabef8355 (diff) | |
| parent | cd1de3940d9c389b6e69a7040c67d3abb8458ad2 (diff) | |
| download | frameworks_base-5f851a89b6a90db206d0e2fa63a60229e2bfcda6.zip frameworks_base-5f851a89b6a90db206d0e2fa63a60229e2bfcda6.tar.gz frameworks_base-5f851a89b6a90db206d0e2fa63a60229e2bfcda6.tar.bz2 | |
am cd1de394: Merge "Track change in NativeCrypto"
* commit 'cd1de3940d9c389b6e69a7040c67d3abb8458ad2':
Track change in NativeCrypto
Diffstat (limited to 'keystore/java')
| -rw-r--r-- | keystore/java/android/security/KeyChain.java | 2 |
1 files changed, 2 insertions, 0 deletions
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 @@ 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) { |