From 29aaf60ace57663f7bbb22a65ea9769f88a48252 Mon Sep 17 00:00:00 2001
From: Kevin Chyn <kchyn@google.com>
Date: Fri, 25 Jan 2019 00:06:55 +0000
Subject: [PATCH] Revert "Plumb setRequireConfirmation to CC"

This reverts commit 56c745c38e08694367321ac9f24b2a8dc083e024.

Reason for revert: Adding functionality differently

Change-Id: Iadc276ff32b9bef4ea3d7dc6dc051dcfc943e134
---
 .../android/settings/password/BiometricFragment.java  | 11 -----------
 .../password/ConfirmDeviceCredentialActivity.java     | 11 +++--------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/src/com/android/settings/password/BiometricFragment.java b/src/com/android/settings/password/BiometricFragment.java
index 171b61eb5de..13ec5431d68 100644
--- a/src/com/android/settings/password/BiometricFragment.java
+++ b/src/com/android/settings/password/BiometricFragment.java
@@ -43,7 +43,6 @@ public class BiometricFragment extends InstrumentedFragment {
     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 @@ public class BiometricFragment extends InstrumentedFragment {
             .setDescription(mPromptInfo.getDescription())
             .setNegativeButton(mPromptInfo.getNegativeButtonText(), mClientExecutor,
                     mNegativeButtonListener)
-            .setRequireConfirmation(mPromptInfo.getRequireConfirmation())
             .build();
         mCancellationSignal = new CancellationSignal();
 
@@ -173,10 +171,6 @@ public class BiometricFragment extends InstrumentedFragment {
             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 @@ public class BiometricFragment extends InstrumentedFragment {
                 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 0d9b21d7c9a..5eb1f322c27 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
@@ -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;