PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update Settings with BiometricPrompt API update"

Browse Source
This commit is contained in:
Kevin Chyn
2019-03-05 18:25:27 +00:00
committed by Android (Google) Code Review
parent 05461f7096 37293d59d3
commit 635dfc8fdb
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/password/BiometricFragment.java
View File

@@ -125,7 +125,7 @@ public class BiometricFragment extends InstrumentedFragment {
.setUseDefaultTitle() // use default title if title is null/empty
.setSubtitle(mBundle.getString(BiometricPrompt.KEY_SUBTITLE))
.setDescription(mBundle.getString(BiometricPrompt.KEY_DESCRIPTION))
.setRequireConfirmation(
.setConfirmationRequired(
mBundle.getBoolean(BiometricPrompt.KEY_REQUIRE_CONFIRMATION, true))
.setNegativeButton(getResources().getString(
R.string.confirm_device_credential_use_alternate_method),

2
src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
View File

@@ -635,7 +635,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
.setDescription(description);
if (keyguardManager.isDeviceSecure()) {
builder.setAllowDeviceCredential(true);
builder.setDeviceCredentialAllowed(true);
}
final BiometricPrompt bp = builder.build();