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

Commit 23164924 authored by Shawn Willden's avatar Shawn Willden Committed by android-build-merger
Browse files

Merge "Correct the keystore alias used for secure imports" into pi-dev am: 143c65d5 

am: bd3440ca

Change-Id: I84b68a7caa793c776140cdd2bd79b5b76c63ddd3
parents ac05a1b7 bd3440ca

keystore/java/android/security/keystore/AndroidKeyStoreSpi.java

+1 −1
Original line number Diff line number Diff line
@@ -811,7 +811,7 @@ public class AndroidKeyStoreSpi extends KeyStoreSpi { 
        }



        int errorCode = mKeyStore.importWrappedKey(

            Credentials.USER_SECRET_KEY + alias,

            Credentials.USER_PRIVATE_KEY + alias,

            entry.getWrappedKeyBytes(),

            Credentials.USER_PRIVATE_KEY + entry.getWrappingKeyAlias(),

            maskingKey,