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

Commit d172ebb6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Force application context for KeyChain bindings"

parents aac2ac2d 43e235c0

keystore/java/android/security/KeyChain.java

+2 −2
Original line number Diff line number Diff line
@@ -409,7 +409,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);
@@ -453,7 +453,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();