commit 5e5220d63e5757733e7663ffc0e6d74fccc80c48
author James Willcox <jwillcox@google.com> Fri Jan 17 15:51:35 2025 +0000
committer James Willcox <jwillcox@google.com> Fri Jan 17 21:34:55 2025 +0000
tree 27c47ab580ec4129fe1178d0a673149019ff1b34
parent 7abcfd26bda14fd257fd4f6d7d5cc6cc1e454b55

Remove android.hardware.biometrics.last_authentication_time

This flag has shipped.

Bug: 390624504
Test: atest BiometricManagerTest
Flag: EXEMPT removing a shipped flag
Change-Id: Id8111ff7537c58a35824e9640aea9bfbf8f9150a

keystore2/src/authorization.rs

diff --git a/keystore2/src/authorization.rs b/keystore2/src/authorization.rs
index c76f86b..7812df6 100644
--- a/keystore2/src/authorization.rs
+++ b/keystore2/src/authorization.rs
@@ -20,7 +20,6 @@
 use crate::ks_err;
 use crate::permission::KeystorePerm;
 use crate::utils::{check_keystore_permission, watchdog as wd};
-use aconfig_android_hardware_biometrics_rust;
 use android_hardware_security_keymint::aidl::android::hardware::security::keymint::{
     HardwareAuthToken::HardwareAuthToken, HardwareAuthenticatorType::HardwareAuthenticatorType,
 };
@@ -36,7 +35,6 @@
 use anyhow::{Context, Result};
 use keystore2_crypto::Password;
 use keystore2_selinux as selinux;
-use std::ffi::CString;
 
 /// This is the Authorization error type, it wraps binder exceptions and the
 /// Authorization ResponseCode
@@ -288,13 +286,6 @@
         secure_user_id: i64,
         auth_types: &[HardwareAuthenticatorType],
     ) -> binder::Result<i64> {
-        if aconfig_android_hardware_biometrics_rust::last_authentication_time() {
-            self.get_last_auth_time(secure_user_id, auth_types).map_err(into_logged_binder)
-        } else {
-            Err(BinderStatus::new_service_specific_error(
-                ResponseCode::PERMISSION_DENIED.0,
-                Some(CString::new("Feature is not enabled.").unwrap().as_c_str()),
-            ))
-        }
+        self.get_last_auth_time(secure_user_id, auth_types).map_err(into_logged_binder)
     }
 }

keystore2/tests/keystore2_client_authorizations_tests.rs

diff --git a/keystore2/tests/keystore2_client_authorizations_tests.rs b/keystore2/tests/keystore2_client_authorizations_tests.rs
index 6fa3d64..a739efb 100644
--- a/keystore2/tests/keystore2_client_authorizations_tests.rs
+++ b/keystore2/tests/keystore2_client_authorizations_tests.rs
@@ -19,7 +19,6 @@
     verify_certificate_serial_num, verify_certificate_subject_name, SAMPLE_PLAIN_TEXT,
 };
 use crate::{require_keymint, skip_test_if_no_app_attest_key_feature};
-use aconfig_android_hardware_biometrics_rust;
 use android_hardware_security_keymint::aidl::android::hardware::security::keymint::{
     Algorithm::Algorithm, BlockMode::BlockMode, Digest::Digest, EcCurve::EcCurve,
     ErrorCode::ErrorCode, KeyPurpose::KeyPurpose, PaddingMode::PaddingMode,
@@ -925,25 +924,7 @@
 }
 
 #[test]
-fn keystore2_flagged_off_get_last_auth_password_permission_denied() {
-    if aconfig_android_hardware_biometrics_rust::last_authentication_time() {
-        return;
-    }
-
-    let keystore_auth = get_keystore_auth_service();
-
-    let result = keystore_auth.getLastAuthTime(0, &[HardwareAuthenticatorType::PASSWORD]);
-
-    assert!(result.is_err());
-    assert_eq!(result.unwrap_err().service_specific_error(), ResponseCode::PERMISSION_DENIED.0);
-}
-
-#[test]
-fn keystore2_flagged_on_get_last_auth_password_success() {
-    if !aconfig_android_hardware_biometrics_rust::last_authentication_time() {
-        return;
-    }
-
+fn keystore2_get_last_auth_password_success() {
     let keystore_auth = get_keystore_auth_service();
 
     add_hardware_token(HardwareAuthenticatorType::PASSWORD);
@@ -951,11 +932,7 @@
 }
 
 #[test]
-fn keystore2_flagged_on_get_last_auth_fingerprint_success() {
-    if !aconfig_android_hardware_biometrics_rust::last_authentication_time() {
-        return;
-    }
-
+fn keystore2_get_last_auth_fingerprint_success() {
     let keystore_auth = get_keystore_auth_service();
 
     add_hardware_token(HardwareAuthenticatorType::FINGERPRINT);