fixup! delegate final confirmation step to AOSP's ChooseLockPassword

Test: atest -c SettingsUnitTests:com.android.settings.password.generate

Author: inthewaves

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

@@ -271,6 +271,9 @@ public static class ChooseLockPasswordFragment extends InstrumentedFragment
         protected boolean mForFace;
         protected boolean mForBiometrics;
 
+        // PIN/passphrase generation will delegate to this Fragment for the last confirmation step
+        private boolean mFromPasswordGeneration;
+
         private LockscreenCredential mFirstPassword;
         private RecyclerView mPasswordRestrictionView;
         protected boolean mIsAlphaMode;
@@ -515,6 +518,9 @@ public void onCreate(Bundle savedInstanceState) {
             if (mMinMetrics == null) mMinMetrics = new PasswordMetrics(CREDENTIAL_TYPE_NONE);
 
             mTextChangedHandler = new TextChangedHandler();
+
+            mFromPasswordGeneration = intent.getBooleanExtra(
+                    ChooseLockSettingsHelper.EXTRA_KEY_FROM_PASSWORD_GENERATION, false);
         }
 
         @Override
@@ -625,6 +631,21 @@ public void onViewCreated(View view, Bundle savedInstanceState) {
                             .setUserId(mUserId)
                             .show();
                 }
+
+                if (mFromPasswordGeneration) {
+                    final LockscreenCredential generatedPassword = intent.getParcelableExtra(
+                            ChooseLockSettingsHelper.EXTRA_KEY_FROM_PASSWORD_GENERATION_GENERATED_PASSWORD, LockscreenCredential.class);
+                    if (generatedPassword != null) {
+                        final var isAutoPinConfirm = intent.getBooleanExtra(
+                                ChooseLockSettingsHelper.EXTRA_KEY_FROM_PASSWORD_GENERATION_AUTO_PIN_CONFIRM, false);
+                        mIsAutoPinConfirmOptionSetManually = true;
+                        mAutoPinConfirmOption.setChecked(isAutoPinConfirm);
+                        // simulate the user inputting this generated password so that it's
+                        // validated against existing AOSP validation code
+                        handleNext(generatedPassword);
+                        // do not zeroize generatedPassword; it might be stored in mChosenPassword
+                    }
+                }
             } else {
 
                 // restore from previous state
@@ -815,14 +836,23 @@ private byte[] getPasswordHistoryHashFactor() {
         }
 
         public void handleNext() {
+            handleNext(null);
+        }
+
+        public void handleNext(@Nullable LockscreenCredential chosenPasswordOverride) {
             if (mSaveAndFinishWorker != null) return;
             // TODO(b/120484642): This is a point of entry for passwords from the UI
-            final Editable passwordText = mPasswordEntry.getText();
-            if (TextUtils.isEmpty(passwordText)) {
-                return;
+            if (chosenPasswordOverride != null && mUiStage == Stage.Introduction) {
+                // simulate generated password being used as user input
+                mChosenPassword = chosenPasswordOverride;
+            } else {
+                final Editable passwordText = mPasswordEntry.getText();
+                if (TextUtils.isEmpty(passwordText)) {
+                    return;
+                }
+                mChosenPassword = mIsAlphaMode ? LockscreenCredential.createPassword(passwordText)
+                        : LockscreenCredential.createPin(passwordText);
             }
-            mChosenPassword = mIsAlphaMode ? LockscreenCredential.createPassword(passwordText)
-                    : LockscreenCredential.createPin(passwordText);
             if (mUiStage == Stage.Introduction) {
                 if (validatePassword(mChosenPassword)) {
                     mFirstPassword = mChosenPassword;
@@ -1031,7 +1061,14 @@ protected void updateUi() {
                 mAutoConfirmSecurityMessage.setVisibility(View.GONE);
             }
             final int stage = getStageType();
-            if (getStageType() != Stage.TYPE_NONE) {
+            if (mFromPasswordGeneration) {
+                // this is the third confirmation; let the user know that they're done after this
+                mMessage.setVisibility(View.VISIBLE);
+                final var msg = mIsAlphaMode
+                        ? R.string.lock_screen_generate_confirm_last_desc_passphrase
+                        : R.string.lock_screen_generate_confirm_last_desc_pin;
+                mMessage.setText(getString(msg));
+            } else if (getStageType() != Stage.TYPE_NONE) {
                 int message = mUiStage.getMessage(mIsAlphaMode, stage);
                 if (message != 0) {
                     mMessage.setVisibility(View.VISIBLE);

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

@@ -128,6 +128,19 @@ public final class ChooseLockSettingsHelper {
     public static final String EXTRA_KEY_CHOOSE_LOCK_SCREEN_DESCRIPTION =
             "choose_lock_setup_screen_description";
 
+    /**
+     * Indicate whether it's being launched from PIN/passphrase password generation activity,
+     * since that will defer verification and saving of the PIN/passphrase to the base AOSP
+     * activity.
+     **/
+    public static final String EXTRA_KEY_FROM_PASSWORD_GENERATION = "from_password_generation";
+
+    public static final String EXTRA_KEY_FROM_PASSWORD_GENERATION_GENERATED_PASSWORD =
+            "password_generation__generated_password";
+
+    public static final String EXTRA_KEY_FROM_PASSWORD_GENERATION_AUTO_PIN_CONFIRM =
+            "password_generation__auto_pin_confirm";
+
     @VisibleForTesting @NonNull LockPatternUtils mLockPatternUtils;
     @NonNull private final Activity mActivity;
     @Nullable private final Fragment mFragment;