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

Merge "Add plumbing for setRequireConfirmation to CC"

Browse Source
This commit is contained in:
Kevin Chyn
2019-01-24 10:30:36 +00:00
committed by Android (Google) Code Review
parent 07d4065ace d75a03b722
commit 5782a4a778
1 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
core/java/android/app/KeyguardManager.java
View File

@@ -100,6 +100,12 @@ public class KeyguardManager {
*/
public static final String EXTRA_DESCRIPTION = "android.app.extra.DESCRIPTION";
/**
* A boolean value to forward to {@link android.hardware.biometrics.BiometricPrompt}.
* @hide
*/
public static final String EXTRA_USE_IMPLICIT = "android.app.extra.USE_IMPLICIT";
/**
* A CharSequence description to show to the user on the alternate button when used with
* {@link #ACTION_CONFIRM_FRP_CREDENTIAL}.
@@ -123,14 +129,39 @@ public class KeyguardManager {
* {@link android.app.Activity#startActivityForResult(Intent, int)} and check for
* {@link android.app.Activity#RESULT_OK} if the user successfully completes the challenge.
*
* @param title Title to be shown on the dialog.
* @param description Description to be shown on the dialog.
* @return the intent for launching the activity or null if no password is required.
**/
@RequiresFeature(PackageManager.FEATURE_SECURE_LOCK_SCREEN)
public Intent createConfirmDeviceCredentialIntent(CharSequence title, CharSequence description) {
if (!isDeviceSecure()) return null;
return createConfirmDeviceCredentialIntent(title, description, false /* useImplicit */);
}
/**
* Get an intent to prompt the user to confirm credentials (pin, pattern or password)
* for the current user of the device. The caller is expected to launch this activity using
* {@link android.app.Activity#startActivityForResult(Intent, int)} and check for
* {@link android.app.Activity#RESULT_OK} if the user successfully completes the challenge.
*
* @param title Title to be shown on the dialog.
* @param description Description to be shown on the dialog.
* @param useImplicit If useImplicit is set to true, ConfirmDeviceCredentials will invoke
* {@link android.hardware.biometrics.BiometricPrompt} with
* {@link android.hardware.biometrics.BiometricPrompt.Builder#setRequireConfirmation(
* boolean)} set to false.
* @return the intent for launching the activity or null if no password is required.
* @hide
*/
public Intent createConfirmDeviceCredentialIntent(CharSequence title, CharSequence description,
boolean useImplicit) {
if (!isDeviceSecure()) {
return null;
}
Intent intent = new Intent(ACTION_CONFIRM_DEVICE_CREDENTIAL);
intent.putExtra(EXTRA_TITLE, title);
intent.putExtra(EXTRA_DESCRIPTION, description);
intent.putExtra(EXTRA_USE_IMPLICIT, useImplicit);
// explicitly set the package for security
intent.setPackage(getSettingsPackageForIntent(intent));