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

Commit 175f6664 authored by Robert Berry's avatar Robert Berry Committed by android-build-merger
Browse files

Merge "Do not throw KeystoreException for when a key does not exist" into pi-dev 

am: 73b7722c

Change-Id: I33b404ffc1e4554c3f3f76a4cd92d10fe4923761
parents 3af70053 73b7722c

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);