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

Commit 6909539a authored by Robert Berry's avatar Robert Berry Committed by android-build-merger
Browse files

Merge "Small fix for the key grant alias used in importKey" into pi-dev am: f9332469 

am: 157aee22

Change-Id: Ida134803f6c251448ba65cfcc87669c01ea99f2b
parents ce50efa3 157aee22

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

+1 −1
Original line number Diff line number Diff line
@@ -578,7 +578,7 @@ public class RecoveryController { 
            if (grantAlias == null) {

                throw new InternalRecoveryServiceException("Null grant alias");

            }

            return getKeyFromGrant(alias);

            return getKeyFromGrant(grantAlias);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        } catch (UnrecoverableKeyException e) {