Revert "Plumb setRequireConfirmation to CC"
This reverts commit 56c745c38e08694367321ac9f24b2a8dc083e024.
Reason for revert: Adding functionality differently
Change-Id: Iadc276ff32b9bef4ea3d7dc6dc051dcfc943e134
diff --git a/src/com/android/settings/password/BiometricFragment.java b/src/com/android/settings/password/BiometricFragment.java
index 171b61e..13ec543 100644
--- a/src/com/android/settings/password/BiometricFragment.java
+++ b/src/com/android/settings/password/BiometricFragment.java
@@ -43,7 +43,6 @@
private static final String KEY_SUBTITLE = "subtitle";
private static final String KEY_DESCRIPTION = "description";
private static final String KEY_NEGATIVE_TEXT = "negative_text";
- private static final String KEY_REQUIRE_CONFIRMATION = "require_confirmation";
// Re-set by the application. Should be done upon orientation changes, etc
private Executor mClientExecutor;
@@ -128,7 +127,6 @@
.setDescription(mPromptInfo.getDescription())
.setNegativeButton(mPromptInfo.getNegativeButtonText(), mClientExecutor,
mNegativeButtonListener)
- .setRequireConfirmation(mPromptInfo.getRequireConfirmation())
.build();
mCancellationSignal = new CancellationSignal();
@@ -173,10 +171,6 @@
return mBundle.getCharSequence(KEY_NEGATIVE_TEXT);
}
- public boolean getRequireConfirmation() {
- return mBundle.getBoolean(KEY_REQUIRE_CONFIRMATION);
- }
-
public static class Builder {
private final Bundle mBundle = new Bundle();
@@ -200,11 +194,6 @@
return this;
}
- public Builder setRequireConfirmation(boolean requireConfirmation) {
- mBundle.putBoolean(KEY_REQUIRE_CONFIRMATION, requireConfirmation);
- return this;
- }
-
public PromptInfo build() {
return new PromptInfo(mBundle);
}
diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
index 0d9b21d..5eb1f32 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
@@ -136,10 +136,6 @@
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 @@
&& !lockPatternUtils.isSeparateProfileChallengeEnabled(mUserId)) {
mCredentialMode = CREDENTIAL_MANAGED;
if (isBiometricAllowed(effectiveUserId)) {
- showBiometricPrompt(requireConfirmation);
+ showBiometricPrompt();
launchedBiometric = true;
} else {
showConfirmCredentials();
@@ -185,7 +181,7 @@
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 @@
&& !isBiometricDisabledByAdmin(effectiveUserId);
}
- private void showBiometricPrompt(boolean requireConfirmation) {
+ private void showBiometricPrompt() {
mBiometricManager.setActiveUser(mUserId);
mBiometricFragment = (BiometricFragment) getSupportFragmentManager()
@@ -259,7 +255,6 @@
.setSubtitle(mDetails)
.setNegativeButtonText(getResources()
.getString(R.string.confirm_device_credential_use_alternate_method))
- .setRequireConfirmation(requireConfirmation)
.build();
mBiometricFragment = BiometricFragment.newInstance(info);
newFragment = true;