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

Commit 584c7743 authored by Grace Cheng's avatar Grace Cheng Committed by Joshua Mccloskey
Browse files

Implement SFPS “require screen on to auth” 

Creates new setting on SFPS to require screen on before unlocking a
device. Also sets up toggles for this setting at the end of fingerprint
enrollment and on the fingerprint settings page, and adds test to verify
expected behavior.

Test: atest KeyguardUpdateMonitorTest#testStartsListeningForSfps_whenKeyguardIsVisible_ifRequireScreenOnToAuthEnabled
Fixes: 249169615
Fixes: 245343077
Fixes: 248530806
Change-Id: Ibc55dfa6667ec281add11a2665fceb073974ccb0
Merged-In: I4aa716fb5b288ef6f92a5c403a1fd5e586e889d0
parent 3c10ee01

core/java/android/hardware/fingerprint/FingerprintManager.java

+0 −1
Original line number Diff line number Diff line
@@ -918,7 +918,6 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing 
        }

    }





    /**

     * Forwards BiometricStateListener to FingerprintService

     * @param listener new BiometricStateListener being added

core/java/android/provider/Settings.java

+7 −0
Original line number Diff line number Diff line
@@ -9775,6 +9775,13 @@ public final class Settings { 
        public static final String FINGERPRINT_SIDE_FPS_AUTH_DOWNTIME =

                "fingerprint_side_fps_auth_downtime";













        /**













         * Whether or not a SFPS device is required to be interactive for auth to unlock the device.













         * @hide













         */













        public static final String SFPS_REQUIRE_SCREEN_ON_TO_AUTH_ENABLED =













                "sfps_require_screen_on_to_auth_enabled";



























        /**















         * Whether or not debugging is enabled.















         * @hide

































core/res/res/values/config.xml



+4
−0




























Original line number
Diff line number
Diff line








@@ -4967,6 +4967,10 @@













    <!-- If face auth sends the user directly to home/last open app, or stays on keyguard -->















    <bool name="config_faceAuthDismissesKeyguard">true</bool>





























    <!-- Default value for whether a SFPS device is required to be interactive for fingerprint auth













    to unlock the device.  -->













    <bool name="config_requireScreenOnToAuthEnabled">false</bool>





























    <!-- The component name for the default profile supervisor, which can be set as a profile owner















    even after user setup is complete. The defined component should be used for supervision purposes















    only. The component must be part of a system app. -->

































core/res/res/values/symbols.xml



+1
−0




























Original line number
Diff line number
Diff line








@@ -2723,6 +2723,7 @@













  <java-symbol type="array" name="config_face_acquire_vendor_biometricprompt_ignorelist" />















  <java-symbol type="bool" name="config_faceAuthSupportsSelfIllumination" />















  <java-symbol type="bool" name="config_faceAuthDismissesKeyguard" />













  <java-symbol type="bool" name="config_requireScreenOnToAuthEnabled" />































  <!-- Face config -->















  <java-symbol type="integer" name="config_faceMaxTemplatesPerUser" />

































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



+1
−0




























Original line number
Diff line number
Diff line








@@ -122,6 +122,7 @@ public class SecureSettings {













        Settings.Secure.FINGERPRINT_SIDE_FPS_BP_POWER_WINDOW,















        Settings.Secure.FINGERPRINT_SIDE_FPS_ENROLL_TAP_WINDOW,















        Settings.Secure.FINGERPRINT_SIDE_FPS_AUTH_DOWNTIME,













        Settings.Secure.SFPS_REQUIRE_SCREEN_ON_TO_AUTH_ENABLED,















        Settings.Secure.ACTIVE_UNLOCK_ON_WAKE,















        Settings.Secure.ACTIVE_UNLOCK_ON_UNLOCK_INTENT,















        Settings.Secure.ACTIVE_UNLOCK_ON_BIOMETRIC_FAIL,