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

Revert "Plumb setRequireConfirmation to CC"

Browse Source 
This reverts commit 56c745c38e.

Reason for revert: Adding functionality differently

Change-Id: Iadc276ff32b9bef4ea3d7dc6dc051dcfc943e134
This commit is contained in:
Kevin Chyn
2019-01-25 00:06:55 +00:00
parent 8167b65871
commit 29aaf60ace
2 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
View File

@@ -136,10 +136,6 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
Intent intent = getIntent();
mTitle = intent.getStringExtra(KeyguardManager.EXTRA_TITLE);
mDetails = intent.getStringExtra(KeyguardManager.EXTRA_DESCRIPTION);
final boolean requireConfirmation =
!intent.getBooleanExtra(KeyguardManager.EXTRA_USE_IMPLICIT, true);
String alternateButton = intent.getStringExtra(
KeyguardManager.EXTRA_ALTERNATE_BUTTON_LABEL);
boolean frp = KeyguardManager.ACTION_CONFIRM_FRP_CREDENTIAL.equals(intent.getAction());
@@ -174,7 +170,7 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
&& !lockPatternUtils.isSeparateProfileChallengeEnabled(mUserId)) {
mCredentialMode = CREDENTIAL_MANAGED;
if (isBiometricAllowed(effectiveUserId)) {
showBiometricPrompt(requireConfirmation);
showBiometricPrompt();
launchedBiometric = true;
} else {
showConfirmCredentials();
@@ -185,7 +181,7 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
if (isBiometricAllowed(effectiveUserId)) {
// Don't need to check if biometrics / pin/pattern/pass are enrolled. It will go to
// onAuthenticationError and do the right thing automatically.
showBiometricPrompt(requireConfirmation);
showBiometricPrompt();
launchedBiometric = true;
} else {
showConfirmCredentials();
@@ -246,7 +242,7 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
&& !isBiometricDisabledByAdmin(effectiveUserId);
}
private void showBiometricPrompt(boolean requireConfirmation) {
private void showBiometricPrompt() {
mBiometricManager.setActiveUser(mUserId);
mBiometricFragment = (BiometricFragment) getSupportFragmentManager()
@@ -259,7 +255,6 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
.setSubtitle(mDetails)
.setNegativeButtonText(getResources()
.getString(R.string.confirm_device_credential_use_alternate_method))
.setRequireConfirmation(requireConfirmation)
.build();
mBiometricFragment = BiometricFragment.newInstance(info);
newFragment = true;