diff options
| author | Eric Biggers <ebiggers@google.com> | 2023-11-29 23:28:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-11-29 23:28:13 +0000 |
| commit | 4835baecd79b02500cddc94ec5563c140afad066 (patch) | |
| tree | cdfdb79f23d4a3c1f71bedc50745aac4f53f8d09 | |
| parent | 2dc300aee07133e4c3c9c3e1871f9280658f9e0a (diff) | |
| parent | 6ea1c60e67bddc52acc5881e0b4abe566ee88f77 (diff) | |
| download | security-4835baecd79b02500cddc94ec5563c140afad066.tar.gz | |
Merge "Rename the fix_unlocked_device_required_keys flag" into main
| -rw-r--r-- | keystore2/src/enforcements.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/keystore2/src/enforcements.rs b/keystore2/src/enforcements.rs index 43147e86..04f26e9f 100644 --- a/keystore2/src/enforcements.rs +++ b/keystore2/src/enforcements.rs @@ -603,7 +603,7 @@ impl Enforcements { } } - 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 { |