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

Commit 358ab834 authored by Janis Danisevskis's avatar Janis Danisevskis Committed by Automerger Merge Worker
Browse files

Merge "Keystore 2.0 SPI: Fix NullPointerException in setKeyEntry." am:... 

Merge "Keystore 2.0 SPI: Fix NullPointerException in setKeyEntry." am: 2eef723c am: 3a2461cc am: 1af321ae am: ac0a8c9d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1849773

Change-Id: Idaf7fc0aa20a26aae25f3e80f529ef0abb458481
parents 5a670825 ac0a8c9d

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

+3 −2
Original line number Diff line number Diff line
@@ -601,8 +601,6 @@ public class AndroidKeyStoreSpi extends KeyStoreSpi { 
        }

        KeyProtection params = (KeyProtection) param;



        @SecurityLevel int securityLevel = params.isStrongBoxBacked() ? SecurityLevel.STRONGBOX :

                SecurityLevel.TRUSTED_ENVIRONMENT;

        @Domain int targetDomain = (getTargetDomain());



        if (key instanceof AndroidKeyStoreSecretKey) {
@@ -794,6 +792,9 @@ public class AndroidKeyStoreSpi extends KeyStoreSpi { 
            flags |= IKeystoreSecurityLevel.KEY_FLAG_AUTH_BOUND_WITHOUT_CRYPTOGRAPHIC_LSKF_BINDING;

        }



        @SecurityLevel int securityLevel = params.isStrongBoxBacked() ? SecurityLevel.STRONGBOX :

                SecurityLevel.TRUSTED_ENVIRONMENT;



        try {

            KeyStoreSecurityLevel securityLevelInterface = mKeyStore.getSecurityLevel(

                    securityLevel);