Merge "Force application context for KeyChain bindings" into nyc-mr1-dev (cabc4f59) · Commits · e / os / android_frameworks_base

keystore/java/android/security/KeyChain.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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();