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

Commit f62b45fa authored by Shaquille Johnson's avatar Shaquille Johnson Committed by Automerger Merge Worker
Browse files

Merge "Update exception thrown for keystore" into main am: a7f6cb18 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2827750



Change-Id: I58ece0d3c3c49368f0b313dd254de14152ac02f6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c36437b6 a7f6cb18

keystore/java/android/security/KeyStore2.java

+15 −4
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import android.system.keystore2.ResponseCode; 
import android.util.Log;



import java.util.Calendar;

import java.util.Objects;



/**

 * @hide This should not be made public in its present form because it
@@ -139,13 +138,25 @@ public class KeyStore2 { 
        return new KeyStore2();

    }



    /**

     * Gets the {@link IKeystoreService} that should be started in early_hal in Android.

     *

     * @throws IllegalStateException if the KeystoreService is not available or has not

     * been initialized when called. This is a state that should not happen and indicates

     * and error somewhere in the stack or with the calling processes access permissions.

     */

    @NonNull private synchronized IKeystoreService getService(boolean retryLookup) {

        if (mBinder == null || retryLookup) {

            mBinder = IKeystoreService.Stub.asInterface(ServiceManager

                .getService(KEYSTORE2_SERVICE_NAME));

            Binder.allowBlocking(mBinder.asBinder());

        }

        return Objects.requireNonNull(mBinder);

        if (mBinder == null) {

            throw new IllegalStateException(

                    "Could not connect to Keystore service. Keystore may have crashed or not been"

                            + " initialized");

        }

        Binder.allowBlocking(mBinder.asBinder());

        return mBinder;

    }



    void delete(KeyDescriptor descriptor) throws KeyStoreException {