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

Commit 19dcf2dc authored by Rhed Jao's avatar Rhed Jao
Browse files

Do not finish the activity if the activity result is required 

Repair mode requires the completion result after an user chooses
a new screen lock. This change defers finishing the activity until
the activity result is available.

Bug: 281641188
Test: atest SettingsRoboTests:com.android.settings.password
Change-Id: If635521ef7e1c509950d9683c15dffe45375cf4f
parent accd9ca2

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

+5 −3
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ public class ChooseLockGeneric extends SettingsActivity { 
        private boolean mRequestGatekeeperPasswordHandle = false;

        private boolean mPasswordConfirmed = false;

        private boolean mWaitingForConfirmation = false;

        private boolean mWaitingForActivityResult = false;

        private LockscreenCredential mUserPassword;

        private FingerprintManager mFingerprintManager;

        private FaceManager mFaceManager;
@@ -470,6 +471,7 @@ public class ChooseLockGeneric extends SettingsActivity { 
        public void onActivityResult(int requestCode, int resultCode, Intent data) {

            super.onActivityResult(requestCode, resultCode, data);

            mWaitingForConfirmation = false;

            mWaitingForActivityResult = false;

            if (requestCode == CONFIRM_EXISTING_REQUEST && resultCode == Activity.RESULT_OK) {

                mPasswordConfirmed = true;

                mUserPassword = data != null
@@ -479,7 +481,6 @@ public class ChooseLockGeneric extends SettingsActivity { 
            } else if (requestCode == CHOOSE_LOCK_REQUEST) {

                if (resultCode != RESULT_CANCELED) {

                    getActivity().setResult(resultCode, data);

                    finish();

                } else {

                    // If PASSWORD_TYPE_KEY is set, this activity is used as a trampoline to start

                    // the actual password enrollment. If the result is canceled, which means the
@@ -487,9 +488,9 @@ public class ChooseLockGeneric extends SettingsActivity { 
                    int quality = getIntent().getIntExtra(LockPatternUtils.PASSWORD_TYPE_KEY, -1);

                    if (quality != -1) {

                        getActivity().setResult(RESULT_CANCELED, data);

                        finish();

                    }

                }

                finish();

            } else if (requestCode == CHOOSE_LOCK_BEFORE_BIOMETRIC_REQUEST

                    && resultCode == BiometricEnrollBase.RESULT_FINISHED) {

                Intent intent = getBiometricEnrollIntent(getActivity());
@@ -821,6 +822,7 @@ public class ChooseLockGeneric extends SettingsActivity { 
                }

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

                    intent.putExtra(EXTRA_KEY_REQUEST_WRITE_REPAIR_MODE_PW, true);

                    mWaitingForActivityResult = true;

                }

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

                // If the caller requested Gatekeeper Password Handle to be returned, we assume it
@@ -871,7 +873,7 @@ public class ChooseLockGeneric extends SettingsActivity { 
            // Otherwise, bugs would be caused. (e.g. b/278488549, b/278530059)

            final boolean hasCredential = mLockPatternUtils.isSecure(mUserId);

            if (!getActivity().isChangingConfigurations()

                    && !mWaitingForConfirmation && hasCredential) {

                    && !mWaitingForConfirmation && !mWaitingForActivityResult && hasCredential) {

                getActivity().finish();

            }

        }

tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java

+10 −0
Original line number Diff line number Diff line
@@ -304,6 +304,16 @@ public class ChooseLockGenericTest { 
        assertThat(mActivity.isFinishing()).isTrue();

    }



    @Test

    public void onActivityResult_requestcode102_resultCancel_shouldFinish() {

        initActivity(null);



        mFragment.onActivityResult(ChooseLockGenericFragment.CHOOSE_LOCK_REQUEST,

                Activity.RESULT_CANCELED, null /* data */);



        assertThat(mActivity.isFinishing()).isTrue();

    }



    @Test

    public void onActivityResult_requestcode103_shouldFinish() {

        initActivity(null);