Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4998c5ad authored by Shawn Lin's avatar Shawn Lin
Browse files

Split enabledForApp & enabledOnKeyguard settings for FP and Face 

Make fingerprint & face have their own set of setting keys of
enablaedForApps and enabledForKeyguard.

Bug: 370940762
Test: atest AuthSessionTest
            BiometricServiceTest
	    PreAuthInfoTest
	    KeyguardUpdateMonitorTest
	    BiometricSettingsRepositoryTest
	    SettingsBackupTest
Flag: com.android.settings.flags.biometrics_onboarding_education

Change-Id: Ia7156828d0bce2bbf0389431d3d5299f646bbffe
parent 177b4e45

core/java/android/hardware/biometrics/IBiometricEnabledOnKeyguardCallback.aidl

+1 −1
Original line number Diff line number Diff line
@@ -20,5 +20,5 @@ package android.hardware.biometrics; 
 * @hide

 */

oneway interface IBiometricEnabledOnKeyguardCallback {

    void onChanged(boolean enabled, int userId);

    void onChanged(boolean enabled, int userId, int modality);

}
 
 No newline at end of file

core/java/android/provider/Settings.java

+37 −0
Original line number Diff line number Diff line
@@ -11346,18 +11346,55 @@ public final class Settings { 














        /**















         * Whether or not biometric is allowed on Keyguard.













         *













         * @deprecated Use {@link #FINGERPRINT_KEYGUARD_ENABLED} or {@link #FACE_KEYGUARD_ENABLED}













         * instead.













         *















         * @hide















         */













        @Deprecated















        @Readable















        public static final String BIOMETRIC_KEYGUARD_ENABLED = "biometric_keyguard_enabled";





























        /**















         * Whether or not biometric is allowed for apps (through BiometricPrompt).













         *













         * @deprecated Use {@link #FINGERPRINT_APP_ENABLED} or {@link #FACE_APP_ENABLED} instead.













         *















         * @hide















         */













        @Deprecated















        @Readable















        public static final String BIOMETRIC_APP_ENABLED = "biometric_app_enabled";



























        /**













         * Whether or not fingerprint is allowed on Keyguard.













         * @hide













         */













        @Readable













        public static final String FINGERPRINT_KEYGUARD_ENABLED = "fingerprint_keyguard_enabled";

























        /**













         * Whether or not fingerprint is allowed for apps (through BiometricPrompt).













         * @hide













         */













        @Readable













        public static final String FINGERPRINT_APP_ENABLED = "fingerptint_app_enabled";

























        /**













         * Whether or not face is allowed on Keyguard.













         * @hide













         */













        @Readable













        public static final String FACE_KEYGUARD_ENABLED = "face_keyguard_enabled";

























        /**













         * Whether or not face is allowed for apps (through BiometricPrompt).













         * @hide













         */













        @Readable













        public static final String FACE_APP_ENABLED = "face_app_enabled";



























        /**















         * Whether or not mandatory biometrics is enabled.















         * @hide

































packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java



+4
−0






























Original line number
Diff line number
Diff line








@@ -287,5 +287,9 @@ public class SecureSettings {













        Settings.Secure.ADVANCED_PROTECTION_MODE,















        Settings.Secure.ACCESSIBILITY_KEY_GESTURE_TARGETS,















        Settings.Secure.EM_VALUE,













        Settings.Secure.FACE_APP_ENABLED,













        Settings.Secure.FACE_KEYGUARD_ENABLED,













        Settings.Secure.FINGERPRINT_APP_ENABLED,













        Settings.Secure.FINGERPRINT_KEYGUARD_ENABLED,















    };















}
























packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java



+4
−0






























Original line number
Diff line number
Diff line








@@ -455,5 +455,9 @@ public class SecureSettingsValidators {













                new InclusiveIntegerRangeValidator(0, 1));















        VALIDATORS.put(Secure.ADVANCED_PROTECTION_MODE, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Secure.DISABLE_ADAPTIVE_AUTH_LIMIT_LOCK, BOOLEAN_VALIDATOR);













        VALIDATORS.put(Secure.FACE_APP_ENABLED,  BOOLEAN_VALIDATOR);













        VALIDATORS.put(Secure.FACE_KEYGUARD_ENABLED,  BOOLEAN_VALIDATOR);













        VALIDATORS.put(Secure.FINGERPRINT_APP_ENABLED,  BOOLEAN_VALIDATOR);













        VALIDATORS.put(Secure.FINGERPRINT_KEYGUARD_ENABLED, BOOLEAN_VALIDATOR);















    }















}
























packages/SystemUI/Android.bp



+2
−0






























Original line number
Diff line number
Diff line








@@ -521,6 +521,7 @@ android_library {













        "androidx.compose.animation_animation-graphics",















        "androidx.lifecycle_lifecycle-viewmodel-compose",















        "kairos",













        "aconfig_settings_flags_lib",















    ],















    libs: [















        "keepanno-annotations",










@@ -702,6 +703,7 @@ android_library {













        "androidx.lifecycle_lifecycle-viewmodel-compose",















        "TraceurCommon",















        "Traceur-res",













        "aconfig_settings_flags_lib",















    ],















}