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

Commit bd3440ca 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

Change-Id: I100df017d1a6ad28cea2c6d78b1b0c55230897b3
parents 69baf0d2 143c65d5

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,