| commit | d4553715a356cc886bacb4ddfba81f38e22c9709 | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Thu Nov 30 00:21:18 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 30 00:21:18 2023 +0000 |
| tree | cdfdb79f23d4a3c1f71bedc50745aac4f53f8d09 | |
| parent | abfc6f99d13121026b41da69bc01a8ea8a67d0bc [diff] | |
| parent | 4835baecd79b02500cddc94ec5563c140afad066 [diff] |
Merge "Rename the fix_unlocked_device_required_keys flag" into main am: 4835baecd7 Original change: https://android-review.googlesource.com/c/platform/system/security/+/2843813 Change-Id: I672f702632447e66fa34eed4b866ea75497dc6e7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/keystore2/src/enforcements.rs b/keystore2/src/enforcements.rs index 43147e8..04f26e9 100644 --- a/keystore2/src/enforcements.rs +++ b/keystore2/src/enforcements.rs
@@ -603,7 +603,7 @@ } } - if android_security_flags::fix_unlocked_device_required_keys() { + if android_security_flags::fix_unlocked_device_required_keys_v2() { let (hat, state) = if user_secure_ids.is_empty() { (None, DeferredAuthState::NoAuthRequired) } else if let Some(key_time_out) = key_time_out {