From 6ea1c60e67bddc52acc5881e0b4abe566ee88f77 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Wed, 22 Nov 2023 16:21:48 +0000 Subject: Rename the fix_unlocked_device_required_keys flag This flag was defined as a regular flag and then was later changed to a fixed_read_only flag. This scenario is currently "unsupported" by the flags infrastructure; an error occurs when trying to advance the flag to staging. Work around this by renaming the flag so that the flags infrastructure sees it as an entirely new flag. Bug: 296464083 Bug: 311648623 Test: build Change-Id: Iafde2d63578bf65b3f5a08ab57561eadbe8f6b7a --- keystore2/src/enforcements.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keystore2/src/enforcements.rs') 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 { -- cgit v1.2.3