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

Commit 2eb8ed24 authored by Brian Lee's avatar Brian Lee
Browse files

Add RemoteLockscreenValidationFragment to help retain remote lockscreen 

validation state.

Currently, if ConfirmDeviceCredentialBaseFragment is ever re-created due
to orientation change, screen getting turned off, etc., relevant state
gets lost. This led to the old ConfirmDeviceCredentialBaseFragment
handling results which led to issues such as lockscreen not getting set.
By addiing a retained RemoteLockscreenValidationFragment,
we're able to update the new ConfirmDeviceCredentialBaseFragment
that will handle results. We can also retain other important state like
the device credential guess to be set after successful validation.

Some smaller changes include:
* If the activity is finished for any reason other than "Back" getting
  pressed, RESULT_FIRST_USER is returned instead of RESULT_CANCELED.
* CheckBox, "Forgot [LSKF]?" button, and EditText/LockPatternView
  gets disabled during validation.
* The above also stay disabled if ConfirmDeviceCredentialBaseFragment
  gets re-created and remote lockscreen validation is still in progress.

Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=com.android.settings.password
Test: Manual
Bug: 274983372
Bug: 274991889
Bug: 274792310
Bug: 270395807

Change-Id: Ib6d47430e233a43e6985ab83abae45713c49771f
parent be16edbe

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

+48 −54
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
// TODO (b/35202196): move this class out of the root of the package.

package com.android.settings.password;



import static android.app.Activity.RESULT_FIRST_USER;

import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_LOCK_ATTEMPTS_FAILED;



import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;
@@ -24,7 +25,6 @@ import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME; 
import android.annotation.Nullable;

import android.app.Dialog;

import android.app.KeyguardManager;

import android.app.RemoteLockscreenValidationResult;

import android.app.RemoteLockscreenValidationSession;

import android.app.admin.DevicePolicyManager;

import android.app.admin.ManagedSubscriptionsPolicy;
@@ -38,7 +38,6 @@ import android.os.Bundle; 
import android.os.Handler;

import android.os.UserHandle;

import android.os.UserManager;

import android.service.remotelockscreenvalidation.IRemoteLockscreenValidationCallback;

import android.service.remotelockscreenvalidation.RemoteLockscreenValidationClient;

import android.telecom.TelecomManager;

import android.text.TextUtils;
@@ -55,14 +54,11 @@ import androidx.fragment.app.FragmentManager; 


import com.android.internal.widget.LockPatternUtils;

import com.android.internal.widget.LockscreenCredential;

import com.android.security.SecureBox;

import com.android.settings.R;

import com.android.settings.Utils;

import com.android.settings.core.InstrumentedFragment;



import java.security.InvalidKeyException;

import java.security.NoSuchAlgorithmException;

import java.security.PublicKey;

import com.google.android.setupdesign.GlifLayout;



/**

 * Base fragment to be shared for PIN/Pattern/Password confirmation fragments.
@@ -89,9 +85,13 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFr 
    /** Time we wait before clearing a wrong input attempt (e.g. pattern) and the error message. */

    protected static final long CLEAR_WRONG_ATTEMPT_TIMEOUT_MS = 3000;



    protected static final String FRAGMENT_TAG_REMOTE_LOCKSCREEN_VALIDATION =

            "remote_lockscreen_validation";



    protected boolean mReturnCredentials = false;

    protected boolean mReturnGatekeeperPassword = false;

    protected boolean mForceVerifyPath = false;

    protected GlifLayout mGlifLayout;

    protected CheckBox mCheckBox;

    protected Button mCancelButton;

    /** Button allowing managed profile password reset, null when is not shown. */
@@ -109,8 +109,8 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFr 
    protected BiometricManager mBiometricManager;

    @Nullable protected RemoteLockscreenValidationSession mRemoteLockscreenValidationSession;

    /** Credential saved so the credential can be set for device if remote validation passes */

    @Nullable protected LockscreenCredential mDeviceCredentialGuess;

    @Nullable protected RemoteLockscreenValidationClient mRemoteLockscreenValidationClient;

    protected RemoteLockscreenValidationFragment mRemoteLockscreenValidationFragment;



    private boolean isInternalActivity() {

        return (getActivity() instanceof ConfirmLockPassword.InternalActivity)
@@ -136,8 +136,8 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFr 
                    FeatureFlagUtils.SETTINGS_REMOTE_DEVICE_CREDENTIAL_VALIDATION)) {

                mRemoteValidation = true;

            } else {

                Log.e(TAG, "Remote device credential validation not enabled.");

                getActivity().finish();

                onRemoteLockscreenValidationFailure(

                        "Remote lockscreen validation not enabled.");

            }

        }

        if (mRemoteValidation) {
@@ -146,23 +146,31 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFr 
                    RemoteLockscreenValidationSession.class);

            if (mRemoteLockscreenValidationSession == null

                    || mRemoteLockscreenValidationSession.getRemainingAttempts() == 0) {

                Log.e(TAG, "RemoteLockscreenValidationSession is null or "

                onRemoteLockscreenValidationFailure("RemoteLockscreenValidationSession is null or "

                        + "no more attempts for remote lockscreen validation.");

                getActivity().finish();

            }



            ComponentName remoteLockscreenValidationServiceComponent =

                    intent.getParcelableExtra(Intent.EXTRA_COMPONENT_NAME, ComponentName.class);

            if (remoteLockscreenValidationServiceComponent == null) {

                Log.e(TAG, "RemoteLockscreenValidationService ComponentName is null");

                getActivity().finish();

                onRemoteLockscreenValidationFailure(

                        "RemoteLockscreenValidationService ComponentName is null");

            }

            mRemoteLockscreenValidationClient = RemoteLockscreenValidationClient

                    .create(getContext(), remoteLockscreenValidationServiceComponent);

            if (!mRemoteLockscreenValidationClient.isServiceAvailable()) {

                Log.e(TAG, String.format("RemoteLockscreenValidationService at %s is not available",

                onRemoteLockscreenValidationFailure(String.format(

                        "RemoteLockscreenValidationService at %s is not available",

                        remoteLockscreenValidationServiceComponent.getClassName()));

                getActivity().finish();

            }



            mRemoteLockscreenValidationFragment =

                    (RemoteLockscreenValidationFragment) getFragmentManager()

                            .findFragmentByTag(FRAGMENT_TAG_REMOTE_LOCKSCREEN_VALIDATION);

            if (mRemoteLockscreenValidationFragment == null) {

                mRemoteLockscreenValidationFragment = new RemoteLockscreenValidationFragment();

                getFragmentManager().beginTransaction().add(mRemoteLockscreenValidationFragment,

                        FRAGMENT_TAG_REMOTE_LOCKSCREEN_VALIDATION).commit();

            }

        }
@@ -194,8 +202,10 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFr 
        mCancelButton.setOnClickListener(v -> {

            if (hasAlternateButton) {

                getActivity().setResult(KeyguardManager.RESULT_ALTERNATE);

            }

                getActivity().finish();

            } else if (mRemoteValidation) {

                onRemoteLockscreenValidationFailure("Forgot lockscreen credential button pressed.");

            }

        });

        setupForgotButtonIfManagedProfile(view);
@@ -299,17 +309,11 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFr 
        if (mRemoteLockscreenValidationClient != null) {

            mRemoteLockscreenValidationClient.disconnect();

        }

        if (mDeviceCredentialGuess != null) {

            mDeviceCredentialGuess.zeroize();

        }

        super.onDestroy();

    }



    protected abstract void authenticationSucceeded();



    protected abstract void onRemoteDeviceCredentialValidationResult(

            RemoteLockscreenValidationResult result);



    public void prepareEnterAnimation() {

    }
@@ -411,43 +415,33 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFr 
    }



    protected void validateGuess(LockscreenCredential credentialGuess) {

        if (mCheckBox.isChecked()) {

            // Keep credential in memory since user wants to set guess as screen lock.

            mDeviceCredentialGuess = credentialGuess;

        } else if (mDeviceCredentialGuess != null) {

            mDeviceCredentialGuess.zeroize();

        mRemoteLockscreenValidationFragment.validateLockscreenGuess(

                mRemoteLockscreenValidationClient, credentialGuess,

                mRemoteLockscreenValidationSession.getSourcePublicKey(), mCheckBox.isChecked());

    }



        mRemoteLockscreenValidationClient.validateLockscreenGuess(

                encryptDeviceCredentialGuess(credentialGuess.getCredential()),

                new IRemoteLockscreenValidationCallback.Stub() {

                    @Override

                    public void onSuccess(RemoteLockscreenValidationResult result) {

                        mHandler.post(()->onRemoteDeviceCredentialValidationResult(result));

    protected void updateRemoteLockscreenValidationViews() {

        if (!mRemoteValidation || mRemoteLockscreenValidationFragment == null) {

            return;

        }



                    @Override

                    public void onFailure(String message) {

                        Log.e(TAG, "A failure occurred while trying "

                                + "to validate lockscreen guess: " + message);

                        mHandler.post(()->getActivity().finish());

                    }

                });

        boolean enable = mRemoteLockscreenValidationFragment.isRemoteValidationInProgress();

        mGlifLayout.setProgressBarShown(enable);

        mCheckBox.setEnabled(!enable);

        mCancelButton.setEnabled(!enable);

    }



    private byte[] encryptDeviceCredentialGuess(byte[] guess) {

        try {

            byte[] encodedPublicKey = mRemoteLockscreenValidationSession.getSourcePublicKey();

            PublicKey publicKey = SecureBox.decodePublicKey(encodedPublicKey);

            return SecureBox.encrypt(

                    publicKey,

                    /* sharedSecret= */ null,

                    LockPatternUtils.ENCRYPTED_REMOTE_CREDENTIALS_HEADER,

                    guess);

        } catch (NoSuchAlgorithmException | InvalidKeyException e) {

            Log.w(TAG, "Error encrypting device credential guess. Returning empty byte[].", e);

            return new byte[0];

    /**

     * Finishes the activity with result code {@link android.app.Activity#RESULT_FIRST_USER}

     * after logging the error message.

     * @param message Optional message to log.

     */

    public void onRemoteLockscreenValidationFailure(String message) {

        if (!TextUtils.isEmpty(message)) {

            Log.w(TAG, message);

        }

        getActivity().setResult(RESULT_FIRST_USER);

        getActivity().finish();

    }



    protected abstract void onShowError();

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

+40 −29
Original line number Diff line number Diff line
@@ -71,8 +71,6 @@ import com.android.settings.R; 
import com.android.settingslib.animation.AppearAnimationUtils;

import com.android.settingslib.animation.DisappearAnimationUtils;



import com.google.android.setupdesign.GlifLayout;



import java.util.ArrayList;



public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
@@ -127,7 +125,8 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity { 


    public static class ConfirmLockPasswordFragment extends ConfirmDeviceCredentialBaseFragment

            implements OnClickListener, OnEditorActionListener,

            CredentialCheckResultTracker.Listener, SaveChosenLockWorkerBase.Listener {

            CredentialCheckResultTracker.Listener, SaveChosenLockWorkerBase.Listener,

            RemoteLockscreenValidationFragment.Listener {

        private static final String FRAGMENT_TAG_CHECK_LOCK_RESULT = "check_lock_result";

        private ImeAwareEditText mPasswordEntry;

        private TextViewInputDisabler mPasswordEntryInputDisabler;
@@ -140,7 +139,6 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity { 
        private AppearAnimationUtils mAppearAnimationUtils;

        private DisappearAnimationUtils mDisappearAnimationUtils;

        private boolean mIsManagedProfile;

        private GlifLayout mGlifLayout;

        private CharSequence mCheckBoxLabel;



        // required constructor for fragments
@@ -255,6 +253,7 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity { 
                            ? R.string.lockpassword_forgot_password

                            : R.string.lockpassword_forgot_pin);

                }

                updateRemoteLockscreenValidationViews();

            }



            if (mForgotButton != null) {
@@ -405,6 +404,9 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity { 
                mCountdownTimer = null;

            }

            mCredentialCheckResultTracker.setListener(null);

            if (mRemoteLockscreenValidationFragment != null) {

                mRemoteLockscreenValidationFragment.setListener(null, /* handler= */ null);

            }

        }



        @Override
@@ -426,6 +428,9 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity { 
                        mLockPatternUtils.getCurrentFailedPasswordAttempts(mEffectiveUserId));

            }

            mCredentialCheckResultTracker.setListener(this);

            if (mRemoteLockscreenValidationFragment != null) {

                mRemoteLockscreenValidationFragment.setListener(this, mHandler);

            }

        }



        @Override
@@ -436,13 +441,17 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity { 
        private void updatePasswordEntry() {

            final boolean isLockedOut =

                    mLockPatternUtils.getLockoutAttemptDeadline(mEffectiveUserId) != 0;

            mPasswordEntry.setEnabled(!isLockedOut);

            mPasswordEntryInputDisabler.setInputEnabled(!isLockedOut);

            if (isLockedOut) {

                mImm.hideSoftInputFromWindow(mPasswordEntry.getWindowToken(), 0 /*flags*/);

            } else {

            final boolean isRemoteLockscreenValidationInProgress =

                    mRemoteLockscreenValidationFragment != null

                    && mRemoteLockscreenValidationFragment.isRemoteValidationInProgress();

            boolean shouldEnableInput = !isLockedOut && !isRemoteLockscreenValidationInProgress;

            mPasswordEntry.setEnabled(shouldEnableInput);

            mPasswordEntryInputDisabler.setInputEnabled(shouldEnableInput);

            if (shouldEnableInput) {

                mPasswordEntry.scheduleShowSoftInput();

                mPasswordEntry.requestFocus();

            } else {

                mImm.hideSoftInputFromWindow(mPasswordEntry.getWindowToken(), /* flags= */0);

            }

        }
@@ -472,7 +481,8 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity { 


            if (mRemoteValidation) {

                validateGuess(credential);

                mGlifLayout.setProgressBarShown(true);

                updateRemoteLockscreenValidationViews();

                updatePasswordEntry();

                return;

            }
@@ -604,14 +614,15 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity { 
        }



        @Override

        protected void onRemoteDeviceCredentialValidationResult(

        public void onRemoteLockscreenValidationResult(

                RemoteLockscreenValidationResult result) {

            switch (result.getResultCode()) {

                case RemoteLockscreenValidationResult.RESULT_GUESS_VALID:

                    if (mCheckBox.isChecked()) {

                    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();

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

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

                                .commit();

                        getFragmentManager().executePendingTransactions();
@@ -619,14 +630,14 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity { 
                        saveAndFinishWorker.start(

                                mLockPatternUtils,

                                /* requestGatekeeperPassword= */ true,

                                mDeviceCredentialGuess,

                                mRemoteLockscreenValidationFragment.getLockscreenCredential(),

                                /* currentCredential= */ null,

                                mEffectiveUserId);

                        return;

                    }

                    } else {

                        mCredentialCheckResultTracker.setResult(/* matched= */ true, new Intent(),

                                /* timeoutMs= */ 0, mEffectiveUserId);

                    break;

                    }

                    return;

                case RemoteLockscreenValidationResult.RESULT_GUESS_INVALID:

                    mCredentialCheckResultTracker.setResult(/* matched= */ false, new Intent(),

                            /* timeoutMs= */ 0, mEffectiveUserId);
@@ -636,12 +647,15 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity { 
                            (int) result.getTimeoutMillis(), mEffectiveUserId);

                    break;

                case RemoteLockscreenValidationResult.RESULT_NO_REMAINING_ATTEMPTS:

                    getActivity().finish();

                    break;

                case RemoteLockscreenValidationResult.RESULT_SESSION_EXPIRED:

                    getActivity().finish();

                    onRemoteLockscreenValidationFailure(String.format(

                            "Cannot continue remote lockscreen validation. ResultCode=%d",

                            result.getResultCode()));

                    break;

            }

            mGlifLayout.setProgressBarShown(false);

            updateRemoteLockscreenValidationViews();

            updatePasswordEntry();

            mRemoteLockscreenValidationFragment.clearLockscreenCredential();

        }



        @Override
@@ -701,21 +715,18 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity { 
        }



        /**

         * Callback for when the device credential guess used for remote validation was set as the

         * current device's device credential.

         * Callback for when the current device's lockscreen was set to the guess used for

         * remote lockscreen validation.

         */

        @Override

        public void onChosenLockSaveFinished(boolean wasSecureBefore, Intent resultData) {

            if (mDeviceCredentialGuess != null) {

                mDeviceCredentialGuess.zeroize();

            }

            Log.i(TAG, "Device lockscreen has been set to remote device's lockscreen.");

            mRemoteLockscreenValidationFragment.clearLockscreenCredential();



            Intent result = new Intent();

            if (mRemoteValidation && containsGatekeeperPasswordHandle(resultData)) {

                result.putExtra(EXTRA_KEY_GK_PW_HANDLE, getGatekeeperPasswordHandle(resultData));

            }



            mGlifLayout.setProgressBarShown(false);

            mCredentialCheckResultTracker.setResult(/* matched= */ true, result,

                    /* timeoutMs= */ 0, mEffectiveUserId);

        }

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

+30 −23
Original line number Diff line number Diff line
@@ -59,8 +59,6 @@ import com.android.settingslib.animation.AppearAnimationCreator; 
import com.android.settingslib.animation.AppearAnimationUtils;

import com.android.settingslib.animation.DisappearAnimationUtils;



import com.google.android.setupdesign.GlifLayout;



import java.util.ArrayList;

import java.util.Collections;

import java.util.List;
@@ -97,7 +95,7 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity { 


    public static class ConfirmLockPatternFragment extends ConfirmDeviceCredentialBaseFragment

            implements AppearAnimationCreator<Object>, CredentialCheckResultTracker.Listener,

            SaveChosenLockWorkerBase.Listener {

            SaveChosenLockWorkerBase.Listener, RemoteLockscreenValidationFragment.Listener {



        private static final String FRAGMENT_TAG_CHECK_LOCK_RESULT = "check_lock_result";
@@ -107,7 +105,6 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity { 
        private boolean mDisappearing = false;

        private CountDownTimer mCountdownTimer;



        private GlifLayout mGlifLayout;

        private View mSudContent;



        // caller-supplied text for various prompts
@@ -239,6 +236,7 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity { 
                if (mCancelButton != null && TextUtils.isEmpty(mAlternateButtonText)) {

                    mCancelButton.setText(R.string.lockpassword_forgot_pattern);

                }

                updateRemoteLockscreenValidationViews();

            }



            if (mForgotButton != null) {
@@ -259,6 +257,9 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity { 
                mCountdownTimer.cancel();

            }

            mCredentialCheckResultTracker.setListener(null);

            if (mRemoteLockscreenValidationFragment != null) {

                mRemoteLockscreenValidationFragment.setListener(null, /* handler= */ null);

            }

        }



        @Override
@@ -281,6 +282,12 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity { 
                updateStage(Stage.NeedToUnlock);

            }

            mCredentialCheckResultTracker.setListener(this);

            if (mRemoteLockscreenValidationFragment != null) {

                mRemoteLockscreenValidationFragment.setListener(this, mHandler);

                if (mRemoteLockscreenValidationFragment.isRemoteValidationInProgress()) {

                    mLockPatternView.setEnabled(false);

                }

            }

        }



        @Override
@@ -502,7 +509,7 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity { 


                if (mRemoteValidation) {

                    validateGuess(credential);

                    mGlifLayout.setProgressBarShown(true);

                    updateRemoteLockscreenValidationViews();

                    return;

                }
@@ -617,11 +624,12 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity { 
        }



        @Override

        protected void onRemoteDeviceCredentialValidationResult(

        public void onRemoteLockscreenValidationResult(

                RemoteLockscreenValidationResult result) {

            switch (result.getResultCode()) {

                case RemoteLockscreenValidationResult.RESULT_GUESS_VALID:

                    if (mCheckBox.isChecked()) {

                    if (mCheckBox.isChecked() && mRemoteLockscreenValidationFragment

                            .getLockscreenCredential() != null) {

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

                        ChooseLockPattern.SaveAndFinishWorker saveAndFinishWorker =

                                new ChooseLockPattern.SaveAndFinishWorker();
@@ -632,14 +640,14 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity { 
                        saveAndFinishWorker.start(

                                mLockPatternUtils,

                                /* requestGatekeeperPassword= */ true,

                                mDeviceCredentialGuess,

                                mRemoteLockscreenValidationFragment.getLockscreenCredential(),

                                /* currentCredential= */ null,

                                mEffectiveUserId);

                        return;

                    }

                    } else {

                        mCredentialCheckResultTracker.setResult(/* matched= */ true, new Intent(),

                                /* timeoutMs= */ 0, mEffectiveUserId);

                    break;

                    }

                    return;

                case RemoteLockscreenValidationResult.RESULT_GUESS_INVALID:

                    mCredentialCheckResultTracker.setResult(/* matched= */ false, new Intent(),

                            /* timeoutMs= */ 0, mEffectiveUserId);
@@ -649,12 +657,14 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity { 
                            (int) result.getTimeoutMillis(), mEffectiveUserId);

                    break;

                case RemoteLockscreenValidationResult.RESULT_NO_REMAINING_ATTEMPTS:

                    getActivity().finish();

                    break;

                case RemoteLockscreenValidationResult.RESULT_SESSION_EXPIRED:

                    getActivity().finish();

                    onRemoteLockscreenValidationFailure(String.format(

                            "Cannot continue remote lockscreen validation. ResultCode=%d",

                            result.getResultCode()));

                    break;

            }

            mGlifLayout.setProgressBarShown(false);

            updateRemoteLockscreenValidationViews();

            mRemoteLockscreenValidationFragment.clearLockscreenCredential();

        }



        @Override
@@ -728,21 +738,18 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity { 
        }



        /**

         * Callback for when the device credential guess used for remote validation was set as the

         * current device's device credential.

         * Callback for when the current device's lockscreen to the guess used for

         * remote lockscreen validation.

         */

        @Override

        public void onChosenLockSaveFinished(boolean wasSecureBefore, Intent resultData) {

            if (mDeviceCredentialGuess != null) {

                mDeviceCredentialGuess.zeroize();

            }

            Log.i(TAG, "Device lockscreen has been set to remote device's lockscreen.");

            mRemoteLockscreenValidationFragment.clearLockscreenCredential();



            Intent result = new Intent();

            if (mRemoteValidation && containsGatekeeperPasswordHandle(resultData)) {

                result.putExtra(EXTRA_KEY_GK_PW_HANDLE, getGatekeeperPasswordHandle(resultData));

            }



            mGlifLayout.setProgressBarShown(false);

            mCredentialCheckResultTracker.setResult(/* matched= */ true, result,

                    /* timeoutMs= */ 0, mEffectiveUserId);

        }

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

0 → 100644
+190 −0

File added.

Preview size limit exceeded, changes collapsed.

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

+2 −2
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ public class ConfirmLockPasswordTest { 
        verify(mCredentialCheckResultTracker).setResult(

                eq(true), any(), eq(0), eq(fragment.mEffectiveUserId));

        assertThat(mLockPatternUtils.isSecure(fragment.mEffectiveUserId)).isTrue();

        assertThat(fragment.mDeviceCredentialGuess).isNotNull();

        assertThat(fragment.mRemoteLockscreenValidationFragment.getLockscreenCredential()).isNull();

    }



    @Test
@@ -223,7 +223,7 @@ public class ConfirmLockPasswordTest { 
        verify(mCredentialCheckResultTracker).setResult(

                eq(true), any(), eq(0), eq(fragment.mEffectiveUserId));

        assertThat(mLockPatternUtils.isSecure(fragment.mEffectiveUserId)).isFalse();

        assertThat(fragment.mDeviceCredentialGuess).isNull();

        assertThat(fragment.mRemoteLockscreenValidationFragment.getLockscreenCredential()).isNull();

    }



    @Test