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

Merge "Guard against null component when binding KeyChain" into nyc-dev

Browse Source
This commit is contained in:
Robin Lee
2016-03-03 19:11:35 +00:00
committed by Android (Google) Code Review
parent 1ca7c80844 21bcbc54dd
commit 7854d58392
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -547,11 +547,8 @@ public final class KeyChain {
Intent intent = new Intent(IKeyChainService.class.getName()); Intent intent = new Intent(IKeyChainService.class.getName());
ComponentName comp = intent.resolveSystemService(context.getPackageManager(), 0); ComponentName comp = intent.resolveSystemService(context.getPackageManager(), 0);
intent.setComponent(comp); intent.setComponent(comp);
boolean isBound = context.bindServiceAsUser(intent, if (comp == null || !context.bindServiceAsUser(
keyChainServiceConnection, intent, keyChainServiceConnection, Context.BIND_AUTO_CREATE, user)) {
Context.BIND_AUTO_CREATE,
user);
if (!isBound) {
throw new AssertionError("could not bind to KeyChainService"); throw new AssertionError("could not bind to KeyChainService");
} }
return new KeyChainConnection(context, keyChainServiceConnection, q.take()); return new KeyChainConnection(context, keyChainServiceConnection, q.take());