Better biometric subtitle with createConfirmDeviceCredentialIntent() API

Test: Tested manually with repro steps

Fixes: 224967328
Change-Id: I7e83392f5a2df3c258c07e77a9332b2cfde95225
This commit is contained in:
chengfeitao
2022-12-22 00:28:00 +00:00
parent 160dacf9ad
commit 3f0864af1b
3 changed files with 3 additions and 1 deletions

View File

@@ -451,6 +451,7 @@ public class AppInfoDashboardFragment extends DashboardFragment
}; };
final BiometricPrompt.Builder builder = new BiometricPrompt.Builder(context) final BiometricPrompt.Builder builder = new BiometricPrompt.Builder(context)
.setUseDefaultSubtitle() // use default subtitle if subtitle is null/empty
.setUseDefaultTitle(); // use default title if title is null/empty .setUseDefaultTitle(); // use default title if title is null/empty
final BiometricManager bm = context.getSystemService(BiometricManager.class); final BiometricManager bm = context.getSystemService(BiometricManager.class);

View File

@@ -129,6 +129,7 @@ public class BiometricFragment extends InstrumentedFragment {
mBiometricPrompt = new BiometricPrompt.Builder(getContext()) mBiometricPrompt = new BiometricPrompt.Builder(getContext())
.setTitle(promptInfo.getTitle()) .setTitle(promptInfo.getTitle())
.setUseDefaultTitle() // use default title if title is null/empty .setUseDefaultTitle() // use default title if title is null/empty
.setUseDefaultSubtitle() // use default subtitle if subtitle is null/empty
.setDeviceCredentialAllowed(true) .setDeviceCredentialAllowed(true)
.setSubtitle(promptInfo.getSubtitle()) .setSubtitle(promptInfo.getSubtitle())
.setDescription(promptInfo.getDescription()) .setDescription(promptInfo.getDescription())

View File

@@ -212,7 +212,7 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
getTitleFromCredentialType(credentialType, isEffectiveUserManagedProfile)); getTitleFromCredentialType(credentialType, isEffectiveUserManagedProfile));
} }
if (mDetails == null) { if (mDetails == null) {
promptInfo.setSubtitle( promptInfo.setDeviceCredentialSubtitle(
getDetailsFromCredentialType(credentialType, isEffectiveUserManagedProfile)); getDetailsFromCredentialType(credentialType, isEffectiveUserManagedProfile));
} }