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

Commit 3a38753d authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Android (Google) Code Review
Browse files

Merge "Performant auth update for fingerprint."

parents b7a44e84 fd6f81a9

core/java/android/provider/Settings.java

+3 −1
Original line number Diff line number Diff line
@@ -10013,9 +10013,11 @@ public final class Settings { 














        /**















         * Whether or not a SFPS device is enabling the performant auth setting.













         * The "_V2" suffix was added to re-introduce the default behavior for













         * users. See b/265264294 fore more details.















         * @hide















         */













        public static final String SFPS_PERFORMANT_AUTH_ENABLED = "sfps_performant_auth_enabled";













        public static final String SFPS_PERFORMANT_AUTH_ENABLED = "sfps_performant_auth_enabled_v2";





























        /**















         * Whether or not debugging is enabled.

































core/res/res/values/config.xml



+2
−4




























Original line number
Diff line number
Diff line








@@ -5032,10 +5032,8 @@













    <!-- 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













        {@link KeyguardUpdateMonitor#isDeviceInteractive()} for fingerprint auth













        to unlock the device. -->













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













    <!-- Default value for performant auth feature. -->













    <bool name="config_performantAuthDefault">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

































core/res/res/values/symbols.xml



+1
−1




























Original line number
Diff line number
Diff line








@@ -2656,7 +2656,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" />













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































  <!-- Face config -->















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