diff options
| author | 2016-11-16 14:43:18 +0000 | |
|---|---|---|
| committer | 2016-11-16 14:43:23 +0000 | |
| commit | 868297495b271136d0d483d294e6225b84fc1a0c (patch) | |
| tree | 64413191e3877074d915e462296cf5ca0def16df | |
| parent | 75ec5465f046149f4b53976a1cfd5f46dc51e944 (diff) | |
| parent | dea66146038a28e9c7da2ad04a6119cfd83de2f8 (diff) | |
Merge "Test for null context in getPrivateKey"
| -rw-r--r-- | keystore/java/android/security/KeyChain.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/keystore/java/android/security/KeyChain.java b/keystore/java/android/security/KeyChain.java index 5e59a64b23d4..e566b9d75846 100644 --- a/keystore/java/android/security/KeyChain.java +++ b/keystore/java/android/security/KeyChain.java @@ -414,6 +414,9 @@ public final class KeyChain { if (alias == null) { throw new NullPointerException("alias == null"); } + if (context == null) { + throw new NullPointerException("context == null"); + } final String keyId; try (KeyChainConnection keyChainConnection = bind(context.getApplicationContext())) { |