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

Commit 2220061b authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Do not throw KeystoreException for when a key does not exist"... 

Merge "Merge "Do not throw KeystoreException for when a key does not exist" into pi-dev am: 73b7722c" into pi-dev-plus-aosp
parents c4b93209 175f6664

core/java/android/security/keystore/recovery/RecoveryController.java

+1 −1
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ public class RecoveryController { 
            throws InternalRecoveryServiceException, UnrecoverableKeyException {

        try {

            String grantAlias = mBinder.getKey(alias);

            if (grantAlias == null) {

            if (grantAlias == null || "".equals(grantAlias)) {

                return null;

            }

            return getKeyFromGrant(grantAlias);