Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08afe2e2 authored by Robin Lee's avatar Robin Lee Committed by android-build-merger
Browse files

Force application context for KeyChain bindings am: f04a663d 

am: 4f7d56a7

Change-Id: I5d7cc8196c0bd8f5b0fe7ae8a7ec51da9197fd02
parents 93129f5c 4f7d56a7

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();