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

Commit e414d40e authored by Chun-Wei Wang's avatar Chun-Wei Wang Committed by Android (Google) Code Review
Browse files

Merge changes from topic "simplify_pw" into udc-qpr-dev 

* changes:
  Handle EXTRA_KEY_REQUEST_WRITE_REPAIR_MODE_PW
  Extract common code to SaveChosenLockWorkerBase
parents 2fdc9c94 c726bd48

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

+9 −50
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ import android.text.Spannable; 
import android.text.TextUtils;

import android.text.TextWatcher;

import android.util.Log;

import android.util.Pair;

import android.view.KeyEvent;

import android.view.LayoutInflater;

import android.view.View;
@@ -89,7 +88,6 @@ import com.android.internal.widget.LockPatternUtils; 
import com.android.internal.widget.LockscreenCredential;

import com.android.internal.widget.PasswordValidationError;

import com.android.internal.widget.TextViewInputDisabler;

import com.android.internal.widget.VerifyCredentialResponse;

import com.android.settings.R;

import com.android.settings.SettingsActivity;

import com.android.settings.SetupWizardUtils;
@@ -236,6 +234,7 @@ public class ChooseLockPassword extends SettingsActivity { 
        private LockscreenCredential mCurrentCredential;

        private LockscreenCredential mChosenPassword;

        private boolean mRequestGatekeeperPassword;

        private boolean mRequestWriteRepairModePassword;

        private ImeAwareEditText mPasswordEntry;

        private TextViewInputDisabler mPasswordEntryInputDisabler;
@@ -565,6 +564,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) {
@@ -574,6 +575,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();

                }
@@ -1035,7 +1037,10 @@ public class ChooseLockPassword extends SettingsActivity { 
            setNextEnabled(false);



            mSaveAndFinishWorker = new SaveAndFinishWorker();

            mSaveAndFinishWorker.setListener(this);

            mSaveAndFinishWorker

                    .setListener(this)

                    .setRequestGatekeeperPasswordHandle(mRequestGatekeeperPassword)

                    .setRequestWriteRepairModePassword(mRequestWriteRepairModePassword);



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

                    FRAGMENT_TAG_SAVE_AND_FINISH).commit();
@@ -1055,7 +1060,7 @@ public class ChooseLockPassword extends SettingsActivity { 
                    (mAutoPinConfirmOption != null && mAutoPinConfirmOption.isChecked()),

                    mUserId);



            mSaveAndFinishWorker.start(mLockPatternUtils, mRequestGatekeeperPassword,

            mSaveAndFinishWorker.start(mLockPatternUtils,

                    mChosenPassword, mCurrentCredential, mUserId);

        }
@@ -1108,50 +1113,4 @@ public class ChooseLockPassword extends SettingsActivity { 
            }

        }

    }



    public static class SaveAndFinishWorker extends SaveChosenLockWorkerBase {



        private LockscreenCredential mChosenPassword;

        private LockscreenCredential mCurrentCredential;



        public void start(LockPatternUtils utils, boolean requestGatekeeperPassword,

                LockscreenCredential chosenPassword, LockscreenCredential currentCredential,

                int userId) {

            prepare(utils, requestGatekeeperPassword, userId);



            mChosenPassword = chosenPassword;

            mCurrentCredential = currentCredential != null ? currentCredential

                    : LockscreenCredential.createNone();

            mUserId = userId;



            start();

        }



        @Override

        protected Pair<Boolean, Intent> saveAndVerifyInBackground() {

            final boolean success = mUtils.setLockCredential(

                    mChosenPassword, mCurrentCredential, mUserId);

            if (success) {

                unifyProfileCredentialIfRequested();

            }

            Intent result = null;

            if (success && 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(mChosenPassword,

                        mUserId, 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"

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

                }



                result = new Intent();

                result.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE,

                        response.getGatekeeperPasswordHandle());

            }

            return Pair.create(success, result);

        }

    }

}

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

+9 −51
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import android.os.Bundle; 
import android.os.UserHandle;

import android.os.UserManager;

import android.util.Log;

import android.util.Pair;

import android.util.TypedValue;

import android.view.KeyEvent;

import android.view.LayoutInflater;
@@ -53,7 +52,6 @@ import com.android.internal.widget.LockPatternView; 
import com.android.internal.widget.LockPatternView.Cell;

import com.android.internal.widget.LockPatternView.DisplayMode;

import com.android.internal.widget.LockscreenCredential;

import com.android.internal.widget.VerifyCredentialResponse;

import com.android.settings.R;

import com.android.settings.SettingsActivity;

import com.android.settings.SetupWizardUtils;
@@ -206,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;
@@ -563,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) {
@@ -576,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 +829,10 @@ public class ChooseLockPattern extends SettingsActivity { 
            setRightButtonEnabled(false);



            mSaveAndFinishWorker = new SaveAndFinishWorker();

            mSaveAndFinishWorker.setListener(this);

            mSaveAndFinishWorker

                    .setListener(this)

                    .setRequestGatekeeperPasswordHandle(mRequestGatekeeperPassword)

                    .setRequestWriteRepairModePassword(mRequestWriteRepairModePassword);



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

                    FRAGMENT_TAG_SAVE_AND_FINISH).commit();
@@ -843,7 +848,7 @@ public class ChooseLockPattern extends SettingsActivity { 
                            profileCredential);

                }

            }

            mSaveAndFinishWorker.start(mLockPatternUtils, mRequestGatekeeperPassword,

            mSaveAndFinishWorker.start(mLockPatternUtils,

                    mChosenPattern, mCurrentCredential, mUserId);

        }
@@ -867,51 +872,4 @@ public class ChooseLockPattern extends SettingsActivity { 
            getActivity().finish();

        }

    }



    public static class SaveAndFinishWorker extends SaveChosenLockWorkerBase {



        private LockscreenCredential mChosenPattern;

        private LockscreenCredential mCurrentCredential;



        public void start(LockPatternUtils utils, boolean requestGatekeeperPassword,

                LockscreenCredential chosenPattern, LockscreenCredential currentCredential,

                int userId) {

            prepare(utils, requestGatekeeperPassword, userId);



            mCurrentCredential = currentCredential != null ? currentCredential

                    : LockscreenCredential.createNone();

            mChosenPattern = chosenPattern;

            mUserId = userId;



            start();

        }



        @Override

        protected Pair<Boolean, Intent> saveAndVerifyInBackground() {

            final int userId = mUserId;

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

                    userId);

            if (success) {

                unifyProfileCredentialIfRequested();

            }

            Intent result = null;

            if (success && 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(mChosenPattern,

                        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"

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

                }



                result = new Intent();

                result.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE,

                        response.getGatekeeperPasswordHandle());

            }

            return Pair.create(success, result);

        }

    }

}

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/ConfirmLockPassword.java

+5 −5
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity { 


    public static class ConfirmLockPasswordFragment extends ConfirmDeviceCredentialBaseFragment

            implements OnClickListener, OnEditorActionListener,

            CredentialCheckResultTracker.Listener, SaveChosenLockWorkerBase.Listener,

            CredentialCheckResultTracker.Listener, SaveAndFinishWorker.Listener,

            RemoteLockscreenValidationFragment.Listener {

        private static final String FRAGMENT_TAG_CHECK_LOCK_RESULT = "check_lock_result";

        private ImeAwareEditText mPasswordEntry;
@@ -633,15 +633,15 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity { 
                    if (mCheckBox.isChecked() && mRemoteLockscreenValidationFragment

                            .getLockscreenCredential() != null) {

                        Log.i(TAG, "Setting device screen lock to the other device's screen lock.");

                        ChooseLockPassword.SaveAndFinishWorker saveAndFinishWorker =

                                new ChooseLockPassword.SaveAndFinishWorker();

                        SaveAndFinishWorker saveAndFinishWorker = new SaveAndFinishWorker();

                        getFragmentManager().beginTransaction().add(saveAndFinishWorker, null)

                                .commit();

                        getFragmentManager().executePendingTransactions();

                        saveAndFinishWorker.setListener(this);

                        saveAndFinishWorker

                                .setListener(this)

                                .setRequestGatekeeperPasswordHandle(true);

                        saveAndFinishWorker.start(

                                mLockPatternUtils,

                                /* requestGatekeeperPassword= */ true,

                                mRemoteLockscreenValidationFragment.getLockscreenCredential(),

                                /* currentCredential= */ null,

                                mEffectiveUserId);