summaryrefslogtreecommitdiff
path: root/keystore/java/android/security/KeyChain.java
diff options
context:
space:
mode:
authorRobin Lee <rgl@google.com>2016-07-25 16:09:22 +0100
committerRobin Lee <rgl@google.com>2016-07-25 17:35:12 +0000
commitf04a663d6a06404d000274d551f5e43fca02d88b (patch)
tree018a43b51fd3953e2a1ca2310409cc2176eb6589 /keystore/java/android/security/KeyChain.java
parentdd756c26e2a081365e9a57685419cdb6526c8a8a (diff)
Force application context for KeyChain bindings
Bug: 29873669 Change-Id: I68c11ab19a169498045bbc23bc8fe6a2f46be031 (cherry picked from commit 43e235c0d55fce8ff845c0249a414a1b2daa5b10)
Diffstat (limited to 'keystore/java/android/security/KeyChain.java')
-rw-r--r--keystore/java/android/security/KeyChain.java4
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();