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

Commit 3e7cf168 authored by Robin Lee's avatar Robin Lee
Browse files

Make IKeyChainAliasCallback oneway 

So it can be sent from devicepolicymanager (system_server) to keychain
(a system_app) without waiting on the response and having to do
everything in a background thread.

Side-effect: the regular keychain => app callback is slightly more
efficient now too. in case anyone particularly needs blazing fast
private key user selections.

Fix: 35675253
Test: cts-tradefed run cts --abi=arm64-v8a --skip-device-info --module CtsDevicePolicyManagerTestCases --test 'com.android.cts.devicepolicy.DeviceOwnerTest#testKeyManagement' </dev/null 2>&1
Change-Id: I6e9d96ca3c42e6489d879d8cfb0507eb94838bf1
parent c98c16de

keystore/java/android/security/IKeyChainAliasCallback.aidl

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ package android.security; 
 *

 * @hide

 */

interface IKeyChainAliasCallback {

oneway interface IKeyChainAliasCallback {



    void alias(String alias);

}

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+9 −13
Original line number Diff line number Diff line
@@ -4828,19 +4828,15 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
    private void sendPrivateKeyAliasResponse(final String alias, final IBinder responseBinder) {

        final IKeyChainAliasCallback keyChainAliasResponse =

                IKeyChainAliasCallback.Stub.asInterface(responseBinder);

        new AsyncTask<Void, Void, Void>() {

            @Override

            protected Void doInBackground(Void... unused) {

        // Send the response. It's OK to do this from the main thread because IKeyChainAliasCallback

        // is oneway, which means it won't block if the recipient lives in another process.

        try {

            keyChainAliasResponse.alias(alias);

        } catch (Exception e) {

                    // Catch everything (not just RemoteException): caller could throw a

                    // RuntimeException back across processes.

            // Caller could throw RuntimeException or RemoteException back across processes. Catch

            // everything just to be sure.

            Log.e(LOG_TAG, "error while responding to callback", e);

        }

                return null;

            }

        }.execute();

    }



    /**