diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2016-08-23 12:49:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-08-23 12:49:59 +0000 |
| commit | cabc4f5945d8c591a42f460ef92e01ed131fabc9 (patch) | |
| tree | 535cc4c4db31ee429d339f163dd9e330c4b20cf8 /keystore/java/android/security/KeyChain.java | |
| parent | ee99f0ae465f7f032197efcb119cac5d7a99fcb8 (diff) | |
| parent | f04a663d6a06404d000274d551f5e43fca02d88b (diff) | |
Merge "Force application context for KeyChain bindings" into nyc-mr1-dev
Diffstat (limited to 'keystore/java/android/security/KeyChain.java')
| -rw-r--r-- | keystore/java/android/security/KeyChain.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keystore/java/android/security/KeyChain.java b/keystore/java/android/security/KeyChain.java index cce58c2096f3..30e5a2edd882 100644 --- a/keystore/java/android/security/KeyChain.java +++ b/keystore/java/android/security/KeyChain.java @@ -368,7 +368,7 @@ public final class KeyChain { if (alias == null) { throw new NullPointerException("alias == null"); } - KeyChainConnection keyChainConnection = bind(context); + KeyChainConnection keyChainConnection = bind(context.getApplicationContext()); try { final IKeyChainService keyChainService = keyChainConnection.getService(); final String keyId = keyChainService.requestPrivateKey(alias); @@ -412,7 +412,7 @@ public final class KeyChain { if (alias == null) { throw new NullPointerException("alias == null"); } - KeyChainConnection keyChainConnection = bind(context); + KeyChainConnection keyChainConnection = bind(context.getApplicationContext()); try { IKeyChainService keyChainService = keyChainConnection.getService(); |