diff options
| author | 2024-05-30 15:37:31 +0000 | |
|---|---|---|
| committer | 2024-05-30 15:37:31 +0000 | |
| commit | 13c7e05ec155a41e101ed7f7e82da6cbdd68832c (patch) | |
| tree | c29c757a646a17ccb392de97e44f57c49aa1ffc7 | |
| parent | 9a9d1e0ef65e930f887e8efa7c7c1e54263136cc (diff) | |
| parent | e115c4ce420a4bd074a6b1a16e48e853a4f0fe8c (diff) | |
Merge "Update mandatory biometrics flag" into main
| -rw-r--r-- | core/java/android/hardware/biometrics/flags.aconfig | 7 | ||||
| -rw-r--r-- | services/core/java/com/android/server/biometrics/biometrics.aconfig | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/core/java/android/hardware/biometrics/flags.aconfig b/core/java/android/hardware/biometrics/flags.aconfig index 4284ad09e251..047d1fa4f49a 100644 --- a/core/java/android/hardware/biometrics/flags.aconfig +++ b/core/java/android/hardware/biometrics/flags.aconfig @@ -32,3 +32,10 @@ flag { description: "Feature flag for adding a custom content view API to BiometricPrompt.Builder." bug: "302735104" } + +flag { + name: "mandatory_biometrics" + namespace: "biometrics_framework" + description: "This flag controls whether LSKF fallback is removed from biometric prompt when the phone is outside trusted locations" + bug: "322081563" +} diff --git a/services/core/java/com/android/server/biometrics/biometrics.aconfig b/services/core/java/com/android/server/biometrics/biometrics.aconfig index 712dcee55b7b..92fd9cbcf14e 100644 --- a/services/core/java/com/android/server/biometrics/biometrics.aconfig +++ b/services/core/java/com/android/server/biometrics/biometrics.aconfig @@ -14,10 +14,3 @@ flag { description: "This flag controls whether virtual HAL is used for testing instead of TestHal " bug: "294254230" } - -flag { - name: "mandatory_biometrics" - namespace: "biometrics_framework" - description: "This flag controls whether LSKF fallback is removed from biometric prompt when the phone is outside trusted locations" - bug: "322081563" -} |