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

Commit 635dfc8f authored by Kevin Chyn's avatar Kevin Chyn Committed by Android (Google) Code Review
Browse files

Merge "Update Settings with BiometricPrompt API update"

parents 05461f70 37293d59

src/com/android/settings/password/BiometricFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -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),

src/com/android/settings/wifi/details/WifiDetailPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -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();