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

Commit c726bd48 authored by Chun-Wei Wang's avatar Chun-Wei Wang
Browse files

Handle EXTRA_KEY_REQUEST_WRITE_REPAIR_MODE_PW 

So the new password can be saved per caller's request.

This will remove the additional step to ask the user
to enter the new credential again and thus simplifying
the UI flow.

Bug: 271968977
Bug: 277561275
Test: atest SettingsUnitTests:SaveAndFinishWorkerTest
Test: atest ChooseLockPasswordTest
Change-Id: I20232619225b17edda0a72dad43b120d5a249203
parent 73dcb47e

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

+4 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_C 
import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_DEVICE_PASSWORD_REQUIREMENT_ONLY;

import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_IS_CALLING_APP_ADMIN;

import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_REQUESTED_MIN_COMPLEXITY;

import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_WRITE_REPAIR_MODE_PW;



import android.app.Activity;

import android.app.Dialog;
@@ -795,6 +796,9 @@ public class ChooseLockGeneric extends SettingsActivity { 
                if (getIntent().getBooleanExtra(EXTRA_SHOW_OPTIONS_BUTTON, false)) {

                    intent.putExtra(EXTRA_SHOW_OPTIONS_BUTTON, chooseLockSkipped);

                }

                if (getIntent().getBooleanExtra(EXTRA_KEY_REQUEST_WRITE_REPAIR_MODE_PW, false)) {

                    intent.putExtra(EXTRA_KEY_REQUEST_WRITE_REPAIR_MODE_PW, true);

                }

                intent.putExtra(EXTRA_CHOOSE_LOCK_GENERIC_EXTRAS, getIntent().getExtras());

                // If the caller requested Gatekeeper Password Handle to be returned, we assume it

                // came from biometric enrollment. onActivityResult will put the LockSettingsService

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

+6 −1
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ public class ChooseLockPassword extends SettingsActivity { 
        private LockscreenCredential mCurrentCredential;

        private LockscreenCredential mChosenPassword;

        private boolean mRequestGatekeeperPassword;

        private boolean mRequestWriteRepairModePassword;

        private ImeAwareEditText mPasswordEntry;

        private TextViewInputDisabler mPasswordEntryInputDisabler;
@@ -559,6 +560,8 @@ public class ChooseLockPassword extends SettingsActivity { 
                    ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);

            mRequestGatekeeperPassword = intent.getBooleanExtra(

                    ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, false);

            mRequestWriteRepairModePassword = intent.getBooleanExtra(

                    ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_WRITE_REPAIR_MODE_PW, false);

            if (savedInstanceState == null) {

                updateStage(Stage.Introduction);

                if (confirmCredentials) {
@@ -568,6 +571,7 @@ public class ChooseLockPassword extends SettingsActivity { 
                            .setTitle(getString(R.string.unlock_set_unlock_launch_picker_title))

                            .setReturnCredentials(true)

                            .setRequestGatekeeperPasswordHandle(mRequestGatekeeperPassword)

                            .setRequestWriteRepairModePassword(mRequestWriteRepairModePassword)

                            .setUserId(mUserId)

                            .show();

                }
@@ -1009,7 +1013,8 @@ public class ChooseLockPassword extends SettingsActivity { 
            mSaveAndFinishWorker = new SaveAndFinishWorker();

            mSaveAndFinishWorker

                    .setListener(this)

                    .setRequestGatekeeperPasswordHandle(mRequestGatekeeperPassword);

                    .setRequestGatekeeperPasswordHandle(mRequestGatekeeperPassword)

                    .setRequestWriteRepairModePassword(mRequestWriteRepairModePassword);



            getFragmentManager().beginTransaction().add(mSaveAndFinishWorker,

                    FRAGMENT_TAG_SAVE_AND_FINISH).commit();

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

+6 −1
Original line number Diff line number Diff line
@@ -204,6 +204,7 @@ public class ChooseLockPattern extends SettingsActivity { 


        private LockscreenCredential mCurrentCredential;

        private boolean mRequestGatekeeperPassword;

        private boolean mRequestWriteRepairModePassword;

        protected TextView mHeaderText;

        protected LockPatternView mLockPatternView;

        protected TextView mFooterText;
@@ -561,6 +562,8 @@ public class ChooseLockPattern extends SettingsActivity { 
                    intent.getParcelableExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);

            mRequestGatekeeperPassword = intent.getBooleanExtra(

                    ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, false);

            mRequestWriteRepairModePassword = intent.getBooleanExtra(

                    ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_WRITE_REPAIR_MODE_PW, false);



            if (savedInstanceState == null) {

                if (confirmCredentials) {
@@ -574,6 +577,7 @@ public class ChooseLockPattern extends SettingsActivity { 
                            .setTitle(getString(R.string.unlock_set_unlock_launch_picker_title))

                            .setReturnCredentials(true)

                            .setRequestGatekeeperPasswordHandle(mRequestGatekeeperPassword)

                            .setRequestWriteRepairModePassword(mRequestWriteRepairModePassword)

                            .setUserId(mUserId)

                            .show();
@@ -827,7 +831,8 @@ public class ChooseLockPattern extends SettingsActivity { 
            mSaveAndFinishWorker = new SaveAndFinishWorker();

            mSaveAndFinishWorker

                    .setListener(this)

                    .setRequestGatekeeperPasswordHandle(mRequestGatekeeperPassword);

                    .setRequestGatekeeperPasswordHandle(mRequestGatekeeperPassword)

                    .setRequestWriteRepairModePassword(mRequestWriteRepairModePassword);



            getFragmentManager().beginTransaction().add(mSaveAndFinishWorker,

                    FRAGMENT_TAG_SAVE_AND_FINISH).commit();

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

+2 −0
Original line number Diff line number Diff line
@@ -73,6 +73,8 @@ public final class ChooseLockSettingsHelper { 
    public static final String EXTRA_KEY_GK_PW_HANDLE = "gk_pw_handle";

    public static final String EXTRA_KEY_REQUEST_WRITE_REPAIR_MODE_PW =

            "request_write_repair_mode_pw";

    public static final String EXTRA_KEY_WROTE_REPAIR_MODE_CREDENTIAL =

            "wrote_repair_mode_credential";



    /**

     * When EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL and EXTRA_KEY_UNIFICATION_PROFILE_ID are

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

+48 −18
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.util.Log; 
import android.util.Pair;

import android.widget.Toast;



import androidx.annotation.VisibleForTesting;

import androidx.fragment.app.Fragment;



import com.android.internal.widget.LockPatternUtils;
@@ -45,6 +46,7 @@ public class SaveAndFinishWorker extends Fragment { 


    private LockPatternUtils mUtils;

    private boolean mRequestGatekeeperPassword;

    private boolean mRequestWriteRepairModePassword;

    private boolean mWasSecureBefore;

    private int mUserId;

    private int mUnificationProfileId = UserHandle.USER_NULL;
@@ -72,7 +74,8 @@ public class SaveAndFinishWorker extends Fragment { 
        return this;

    }



    public void start(LockPatternUtils utils, LockscreenCredential chosenCredential,

    @VisibleForTesting

    void prepare(LockPatternUtils utils, LockscreenCredential chosenCredential,

            LockscreenCredential currentCredential, int userId) {

        mUtils = utils;

        mUserId = userId;
@@ -84,7 +87,11 @@ public class SaveAndFinishWorker extends Fragment { 
        mChosenCredential = chosenCredential;

        mCurrentCredential = currentCredential != null ? currentCredential

                : LockscreenCredential.createNone();

    }



    public void start(LockPatternUtils utils, LockscreenCredential chosenCredential,

            LockscreenCredential currentCredential, int userId) {

        prepare(utils, chosenCredential, currentCredential, userId);

        if (mBlocking) {

            finish(saveAndVerifyInBackground().second);

        } else {
@@ -97,31 +104,49 @@ public class SaveAndFinishWorker extends Fragment { 
     * @return pair where the first is a boolean confirming whether the change was successful or not

     * and second is the Intent which has the challenge token or is null.

     */

    private Pair<Boolean, Intent> saveAndVerifyInBackground() {

    @VisibleForTesting

    Pair<Boolean, Intent> saveAndVerifyInBackground() {

        final int userId = mUserId;

        final boolean success = mUtils.setLockCredential(mChosenCredential, mCurrentCredential,

                userId);

        if (success) {

            unifyProfileCredentialIfRequested();

        if (!mUtils.setLockCredential(mChosenCredential, mCurrentCredential, userId)) {

            return Pair.create(false, null);

        }

        Intent result = null;

        if (success && mRequestGatekeeperPassword) {



        unifyProfileCredentialIfRequested();



        @LockPatternUtils.VerifyFlag int flags = 0;

        if (mRequestGatekeeperPassword) {

            // If a Gatekeeper Password was requested, invoke the LockSettingsService code

            // path to return a Gatekeeper Password based on the credential that the user

            // chose. This should only be run if the credential was successfully set.

            final VerifyCredentialResponse response = mUtils.verifyCredential(mChosenCredential,

                    userId, LockPatternUtils.VERIFY_FLAG_REQUEST_GK_PW_HANDLE);



            if (!response.isMatched() || !response.containsGatekeeperPasswordHandle()) {

                Log.e(TAG, "critical: bad response or missing GK PW handle for known good"

                        + " credential: " + response.toString());

            flags |= LockPatternUtils.VERIFY_FLAG_REQUEST_GK_PW_HANDLE;

        }

        if (mRequestWriteRepairModePassword) {

            flags |= LockPatternUtils.VERIFY_FLAG_WRITE_REPAIR_MODE_PW;

        }

        if (flags == 0) {

            return Pair.create(true, null);

        }



            result = new Intent();

        Intent result = new Intent();

        final VerifyCredentialResponse response = mUtils.verifyCredential(mChosenCredential,

                userId, flags);

        if (response.isMatched()) {

            if (mRequestGatekeeperPassword && response.containsGatekeeperPasswordHandle()) {

                result.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE,

                        response.getGatekeeperPasswordHandle());

            } else if (mRequestGatekeeperPassword) {

                Log.e(TAG, "critical: missing GK PW handle for known good credential: " + response);

            }

        } else {

            Log.e(TAG, "critical: bad response for known good credential: " + response);

        }

        return Pair.create(success, result);

        if (mRequestWriteRepairModePassword) {

            // Notify the caller if repair mode credential is saved successfully

            result.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_WROTE_REPAIR_MODE_CREDENTIAL,

                    response.isMatched());

        }



        return Pair.create(true, result);

    }



    private void finish(Intent resultData) {
@@ -141,6 +166,11 @@ public class SaveAndFinishWorker extends Fragment { 
        return this;

    }



    public SaveAndFinishWorker setRequestWriteRepairModePassword(boolean value) {

        mRequestWriteRepairModePassword = value;

        return this;

    }



    public SaveAndFinishWorker setBlocking(boolean blocking) {

        mBlocking = blocking;

        return this;