diff options
| author | Scott Lobdell <slobdell@google.com> | 2021-02-23 11:55:26 -0800 |
|---|---|---|
| committer | Daniel Norman <danielnorman@google.com> | 2021-03-01 15:24:51 -0800 |
| commit | 24818fca475a6726f5ef0cae42149615079af6e9 (patch) | |
| tree | 1a3163ac7ce01c335d8d1c05cacddf47c0a30bfd /keystore/java/android/security/KeyStoreSecurityLevel.java | |
| parent | 8deb6bda58c7ecd95285f4dc934269e0c98c989a (diff) | |
| parent | 0f50c486e59546c32acf3f2cdf6667897600de5c (diff) | |
Merge SP1A.210222.001
Change-Id: If3509f3a660e820f4c8c0b29e007faa868e1f089
Diffstat (limited to 'keystore/java/android/security/KeyStoreSecurityLevel.java')
| -rw-r--r-- | keystore/java/android/security/KeyStoreSecurityLevel.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/keystore/java/android/security/KeyStoreSecurityLevel.java b/keystore/java/android/security/KeyStoreSecurityLevel.java index 372add9b7ecb..d188b6525579 100644 --- a/keystore/java/android/security/KeyStoreSecurityLevel.java +++ b/keystore/java/android/security/KeyStoreSecurityLevel.java @@ -190,7 +190,7 @@ public class KeyStoreSecurityLevel { keyDescriptor.blob = wrappedKey; keyDescriptor.domain = wrappedKeyDescriptor.domain; - return handleExceptions(() -> mSecurityLevel.importWrappedKey(wrappedKeyDescriptor, + return handleExceptions(() -> mSecurityLevel.importWrappedKey(keyDescriptor, wrappingKeyDescriptor, maskingKey, args.toArray(new KeyParameter[args.size()]), authenticatorSpecs)); } |