Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Performant auth update for fingerprint." into tm-qpr-dev am: 0eac7d3313

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20980737

Change-Id: Ida10f3ccee44828d246f3bc958905e534bf69e90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Joshua Mccloskey
2023-01-18 03:20:50 +00:00
committed by Automerger Merge Worker
parent 252ca15518 0eac7d3313
commit 373692c133
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/provider/Settings.java
View File

@@ -9838,9 +9838,11 @@ public final class Settings {
/** /**
* Whether or not a SFPS device is enabling the performant auth setting. * 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 * @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. * Whether or not debugging is enabled.

5
core/res/res/values/config.xml
View File

@@ -4923,9 +4923,8 @@
<!-- If face auth sends the user directly to home/last open app, or stays on keyguard --> <!-- If face auth sends the user directly to home/last open app, or stays on keyguard -->
<bool name="config_faceAuthDismissesKeyguard">true</bool> <bool name="config_faceAuthDismissesKeyguard">true</bool>
<!-- Default value for whether a SFPS device is required to be interactive for fingerprint auth <!-- Default value for performant auth feature. -->
to unlock the device. --> <bool name="config_performantAuthDefault">false</bool>
<bool name="config_requireScreenOnToAuthEnabled">false</bool>
<!-- The component name for the default profile supervisor, which can be set as a profile owner <!-- 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 even after user setup is complete. The defined component should be used for supervision purposes

2
core/res/res/values/symbols.xml
View File

@@ -2713,7 +2713,7 @@
<java-symbol type="array" name="config_face_acquire_vendor_biometricprompt_ignorelist" /> <java-symbol type="array" name="config_face_acquire_vendor_biometricprompt_ignorelist" />
<java-symbol type="bool" name="config_faceAuthSupportsSelfIllumination" /> <java-symbol type="bool" name="config_faceAuthSupportsSelfIllumination" />
<java-symbol type="bool" name="config_faceAuthDismissesKeyguard" /> <java-symbol type="bool" name="config_faceAuthDismissesKeyguard" />
<java-symbol type="bool" name="config_requireScreenOnToAuthEnabled" /> <java-symbol type="bool" name="config_performantAuthDefault" />
<!-- Face config --> <!-- Face config -->
<java-symbol type="integer" name="config_faceMaxTemplatesPerUser" /> <java-symbol type="integer" name="config_faceMaxTemplatesPerUser" />