Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Force application context for KeyChain bindings" into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-08-23 12:49:56 +00:00
committed by Android (Google) Code Review
parent ee99f0ae46 f04a663d6a
commit cabc4f5945
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
keystore/java/android/security/KeyChain.java
View File

@@ -368,7 +368,7 @@ public final class KeyChain {
if (alias == null) { if (alias == null) {
throw new NullPointerException("alias == null"); throw new NullPointerException("alias == null");
} }
KeyChainConnection keyChainConnection = bind(context); KeyChainConnection keyChainConnection = bind(context.getApplicationContext());
try { try {
final IKeyChainService keyChainService = keyChainConnection.getService(); final IKeyChainService keyChainService = keyChainConnection.getService();
final String keyId = keyChainService.requestPrivateKey(alias); final String keyId = keyChainService.requestPrivateKey(alias);
@@ -412,7 +412,7 @@ public final class KeyChain {
if (alias == null) { if (alias == null) {
throw new NullPointerException("alias == null"); throw new NullPointerException("alias == null");
} }
KeyChainConnection keyChainConnection = bind(context); KeyChainConnection keyChainConnection = bind(context.getApplicationContext());
try { try {
IKeyChainService keyChainService = keyChainConnection.getService(); IKeyChainService keyChainService = keyChainConnection.getService();