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

Commit 392e1e23 authored by Rubin Xu's avatar Rubin Xu
Browse files

Allow KeyChain.bindAsUser() to be called on the main thread 

KeyChain.bindAsUser() couldn't be called on the main thread because
it was using the main thread to handle service connection callback.
Add an overload of KeyChain.bindAsUser() that accepts an alternative
handler to process the connection callback, which makes it possible
to call KeyChain from the main UI thread directly.

Bug: 165641221
Test: atest KeyChainTests
Test: m RunKeyChainRoboTests
Change-Id: I4290bccf5ae04de0d84c7091729e86704b937295
parent 6facc82f

keystore/java/android/security/IKeyChainService.aidl

+0 −1
Original line number Original line Diff line number Diff line
@@ -60,7 +60,6 @@ interface IKeyChainService { 
    byte[] getEncodedCaCertificate(String alias, boolean includeDeletedSystem);

    byte[] getEncodedCaCertificate(String alias, boolean includeDeletedSystem);

    List<String> getCaCertificateChainAliases(String rootAlias, boolean includeDeletedSystem);

    List<String> getCaCertificateChainAliases(String rootAlias, boolean includeDeletedSystem);

    void setCredentialManagementApp(String packageName, in AppUriAuthenticationPolicy policy);

    void setCredentialManagementApp(String packageName, in AppUriAuthenticationPolicy policy);

    void updateCredentialManagementAppPolicy(in AppUriAuthenticationPolicy policy);

    boolean hasCredentialManagementApp();

    boolean hasCredentialManagementApp();

    String getCredentialManagementAppPackageName();

    String getCredentialManagementAppPackageName();

    AppUriAuthenticationPolicy getCredentialManagementAppPolicy();

    AppUriAuthenticationPolicy getCredentialManagementAppPolicy();

keystore/java/android/security/KeyChain.java

+30 −3
Original line number Original line Diff line number Diff line
@@ -31,6 +31,7 @@ import android.content.Intent; 
import android.content.ServiceConnection;

import android.content.ServiceConnection;

import android.net.Uri;

import android.net.Uri;

import android.os.Binder;

import android.os.Binder;

import android.os.Handler;

import android.os.IBinder;

import android.os.IBinder;

import android.os.Looper;

import android.os.Looper;

import android.os.Process;

import android.os.Process;
@@ -854,10 +855,26 @@ public final class KeyChain { 
    @WorkerThread

    @WorkerThread

    public static KeyChainConnection bindAsUser(@NonNull Context context, UserHandle user)

    public static KeyChainConnection bindAsUser(@NonNull Context context, UserHandle user)

            throws InterruptedException {

            throws InterruptedException {

        return bindAsUser(context, null, user);

    }



    /**

     * Bind to KeyChainService in the target user.

     * Caller should call unbindService on the result when finished.

     *

     * @throws InterruptedException if interrupted during binding.

     * @throws AssertionError if unable to bind to KeyChainService.

     * @hide

     */

    public static KeyChainConnection bindAsUser(@NonNull Context context, @Nullable Handler handler,

            UserHandle user) throws InterruptedException {



        if (context == null) {

        if (context == null) {

            throw new NullPointerException("context == null");

            throw new NullPointerException("context == null");

        }

        }

        if (handler == null) {

            ensureNotOnMainThread(context);

            ensureNotOnMainThread(context);

        }

        if (!UserManager.get(context).isUserUnlocked(user)) {

        if (!UserManager.get(context).isUserUnlocked(user)) {

            throw new IllegalStateException("User must be unlocked");

            throw new IllegalStateException("User must be unlocked");

        }

        }
@@ -884,9 +901,19 @@ 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);

        if (comp == null) {

            throw new AssertionError("could not resolve KeyChainService");

        }

        intent.setComponent(comp);

        intent.setComponent(comp);

        if (comp == null || !context.bindServiceAsUser(

        final boolean bindSucceed;

                intent, keyChainServiceConnection, Context.BIND_AUTO_CREATE, user)) {

        if (handler != null) {

            bindSucceed = context.bindServiceAsUser(

                    intent, keyChainServiceConnection, Context.BIND_AUTO_CREATE, handler, user);

        } else {

            bindSucceed = context.bindServiceAsUser(

                    intent, keyChainServiceConnection, Context.BIND_AUTO_CREATE, user);

        }

        if (!bindSucceed) {

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

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

        }

        }

        countDownLatch.await();

        countDownLatch.await();