| commit | b25470cd3034e43258cdcfe2853db450421c13a1 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Apr 18 20:43:42 2022 +0000 |
| committer | Xin Li <delphij@google.com> | Mon Apr 18 20:43:42 2022 +0000 |
| tree | ec736e17057f962e3cb08dba4a1e932edbea6f6a | |
| parent | 3e28b020d7c8873f8427fc11d0126275e733ea17 [diff] | |
| parent | 322bce65051688e7c346cebfbe1f9c2b49f8af5f [diff] |
Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047 Bug: 226662282 Merged-In: Ifc2e14a9b60e364323794eaa5a8c181c4f0a78ee Change-Id: Id87ce6ee433f6fc31d18ccdee5a2eb2bc62633e5
diff --git a/keystore2/Android.bp b/keystore2/Android.bp index e7c2752..e6cb4fb 100644 --- a/keystore2/Android.bp +++ b/keystore2/Android.bp
@@ -178,4 +178,5 @@ "liblegacykeystore-rust", "librusqlite", ], + afdo: true, }
diff --git a/keystore2/src/km_compat/km_compat.cpp b/keystore2/src/km_compat/km_compat.cpp index 192f445..6d0630b 100644 --- a/keystore2/src/km_compat/km_compat.cpp +++ b/keystore2/src/km_compat/km_compat.cpp
@@ -126,7 +126,7 @@ case Tag::TRUSTED_CONFIRMATION_REQUIRED: case Tag::UNLOCKED_DEVICE_REQUIRED: case Tag::CREATION_DATETIME: - case Tag::UNIQUE_ID: + case Tag::INCLUDE_UNIQUE_ID: case Tag::IDENTITY_CREDENTIAL_KEY: case Tag::STORAGE_KEY: case Tag::MAC_LENGTH: