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

Commit 143c65d5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Correct the keystore alias used for secure imports" into pi-dev

parents bed68535 fe6d4769
Loading
Loading
Loading
Loading
+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,