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

Commit 157aee22 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

Change-Id: I43efcec91dc8c9e84cbefe2b0dcd7a089046cee3
parents 60efe837 f9332469

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