commit 6f80e953124ae8cfe311b8e10b69496d29a4011c
author Shaquille Johnson <ssjohnson@google.com> Fri Dec 01 15:22:59 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 01 15:22:59 2023 +0000
tree e6e58ba5aa543e50c515125acdbd9f1d5a28e8ac
parent 4835baecd79b02500cddc94ec5563c140afad066
parent f015af1d56608fb257c408d2e9f359c778e5512c

Merge "Remove duplicate code and add fn for flag check" into main

keystore2/src/enforcements.rs

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 {