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

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

Merge "KeyChain: always unbind service" into tm-dev

parents 6ac86e76 c96b611d

keystore/java/android/security/KeyChain.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -1117,6 +1117,7 @@ public final class KeyChain { 
                    intent, keyChainServiceConnection, Context.BIND_AUTO_CREATE, user);

                    intent, keyChainServiceConnection, Context.BIND_AUTO_CREATE, user);

        }

        }

        if (!bindSucceed) {

        if (!bindSucceed) {

            context.unbindService(keyChainServiceConnection);

            throw new AssertionError("could not bind to KeyChainService");

            throw new AssertionError("could not bind to KeyChainService");

        }

        }

        countDownLatch.await();

        countDownLatch.await();