commit 2eef723cedbdcfdd96966a08f206c7ff901155db
author Janis Danisevskis <jdanis@google.com> Fri Oct 08 14:57:47 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 08 14:57:47 2021 +0000
tree 3f9e449baa928dc73080c4b9c6e3fd9091895be4
parent 53e8b03baeaaa1b619f2947453aef96725ff21f3
parent 4ff6274fa770edf86d31dfea36e518d2964b2eee

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

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

diff --git a/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java b/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java
index 67358c4..33411e1 100644
--- a/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java
+++ b/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java
@@ -601,8 +601,6 @@
         }
         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 @@
             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);