diff options
3 files changed, 12 insertions, 2 deletions
diff --git a/core/java/android/hardware/biometrics/flags.aconfig b/core/java/android/hardware/biometrics/flags.aconfig index 2d299000f709..7a23033754c5 100644 --- a/core/java/android/hardware/biometrics/flags.aconfig +++ b/core/java/android/hardware/biometrics/flags.aconfig @@ -61,3 +61,13 @@ flag { description: "Feature flag for biometric prompt improvements in private space" bug: "365554098" } + +flag { + name: "effective_user_bp" + namespace: "biometrics_framework" + description: "Feature flag for using effective user in biometric prompt" + bug: "365094949" + metadata { + purpose: PURPOSE_BUGFIX + } +} diff --git a/services/core/java/com/android/server/biometrics/PreAuthInfo.java b/services/core/java/com/android/server/biometrics/PreAuthInfo.java index a9ada291e51f..e8fa41749473 100644 --- a/services/core/java/com/android/server/biometrics/PreAuthInfo.java +++ b/services/core/java/com/android/server/biometrics/PreAuthInfo.java @@ -146,7 +146,7 @@ class PreAuthInfo { final List<Pair<BiometricSensor, Integer>> ineligibleSensors = new ArrayList<>(); final int effectiveUserId; - if (Flags.privateSpaceBp()) { + if (Flags.effectiveUserBp()) { effectiveUserId = userManager.getCredentialOwnerProfile(userId); } else { effectiveUserId = userId; diff --git a/services/tests/servicestests/src/com/android/server/biometrics/PreAuthInfoTest.java b/services/tests/servicestests/src/com/android/server/biometrics/PreAuthInfoTest.java index 510dd4d9eb5f..cf628add705a 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/PreAuthInfoTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/PreAuthInfoTest.java @@ -315,7 +315,7 @@ public class PreAuthInfoTest { } @Test - @RequiresFlagsEnabled(Flags.FLAG_PRIVATE_SPACE_BP) + @RequiresFlagsEnabled(Flags.FLAG_EFFECTIVE_USER_BP) public void testCredentialOwnerIdAsUserId() throws Exception { when(mUserManager.getCredentialOwnerProfile(USER_ID)).thenReturn(OWNER_ID); |