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

Commit de01d29d authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

Merge changes I838b4797,I9fce3bb8,Ia081a0ad into udc-dev am: c8bc3754 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22338459



Change-Id: I474fa250fefe1b5d68525064a2953f463d620444
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5c8137dd c8bc3754

packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputViewController.java

+7 −9
Original line number Diff line number Diff line
@@ -107,15 +107,8 @@ public abstract class KeyguardAbsKeyInputViewController<T extends KeyguardAbsKey 
        // start fresh

        mDismissing = false;

        mView.resetPasswordText(false /* animate */, false /* announce */);

        // if the user is currently locked out, enforce it.

        long deadline = mLockPatternUtils.getLockoutAttemptDeadline(

                KeyguardUpdateMonitor.getCurrentUser());

        if (shouldLockout(deadline)) {

            handleAttemptLockout(deadline);

        } else {

        resetState();

    }

    }



    @Override

    public boolean needsInput() {
@@ -277,7 +270,12 @@ public abstract class KeyguardAbsKeyInputViewController<T extends KeyguardAbsKey 
    @Override

    public void onResume(int reason) {

        mResumed = true;

        reset();

        // if the user is currently locked out, enforce it.

        long deadline = mLockPatternUtils.getLockoutAttemptDeadline(

                KeyguardUpdateMonitor.getCurrentUser());

        if (shouldLockout(deadline)) {

            handleAttemptLockout(deadline);

        }

    }



    @Override

packages/SystemUI/src/com/android/keyguard/KeyguardPatternViewController.java

+18 −16
Original line number Diff line number Diff line
@@ -260,20 +260,18 @@ public class KeyguardPatternViewController 
        mLockPatternView.setEnabled(true);

        mLockPatternView.clearPattern();



        // if the user is currently locked out, enforce it.

        long deadline = mLockPatternUtils.getLockoutAttemptDeadline(

                KeyguardUpdateMonitor.getCurrentUser());

        if (deadline != 0) {

            handleAttemptLockout(deadline);

        } else {

        displayDefaultSecurityMessage();

    }

    }



    @Override

    public void onResume(int reason) {

        super.onResume(reason);

        reset();

        // if the user is currently locked out, enforce it.

        long deadline = mLockPatternUtils.getLockoutAttemptDeadline(

                KeyguardUpdateMonitor.getCurrentUser());

        if (deadline != 0) {

            handleAttemptLockout(deadline);

        }

    }



    @Override
@@ -300,34 +298,38 @@ public class KeyguardPatternViewController 
    @Override

    public void showPromptReason(int reason) {

        /// TODO: move all this logic into the MessageAreaController?

        int resId =  0;

        switch (reason) {

            case PROMPT_REASON_RESTART:

                mMessageAreaController.setMessage(R.string.kg_prompt_reason_restart_pattern);

                resId = R.string.kg_prompt_reason_restart_pattern;

                break;

            case PROMPT_REASON_TIMEOUT:

                mMessageAreaController.setMessage(R.string.kg_prompt_reason_timeout_pattern);

                resId = R.string.kg_prompt_reason_timeout_pattern;

                break;

            case PROMPT_REASON_DEVICE_ADMIN:

                mMessageAreaController.setMessage(R.string.kg_prompt_reason_device_admin);

                resId = R.string.kg_prompt_reason_device_admin;

                break;

            case PROMPT_REASON_USER_REQUEST:

                mMessageAreaController.setMessage(R.string.kg_prompt_reason_user_request);

                resId = R.string.kg_prompt_reason_user_request;

                break;

            case PROMPT_REASON_PREPARE_FOR_UPDATE:

                mMessageAreaController.setMessage(R.string.kg_prompt_reason_timeout_pattern);

                resId = R.string.kg_prompt_reason_timeout_pattern;

                break;

            case PROMPT_REASON_NON_STRONG_BIOMETRIC_TIMEOUT:

                mMessageAreaController.setMessage(R.string.kg_prompt_reason_timeout_pattern);

                resId = R.string.kg_prompt_reason_timeout_pattern;

                break;

            case PROMPT_REASON_TRUSTAGENT_EXPIRED:

                mMessageAreaController.setMessage(R.string.kg_prompt_reason_timeout_pattern);

                resId = R.string.kg_prompt_reason_timeout_pattern;

                break;

            case PROMPT_REASON_NONE:

                break;

            default:

                mMessageAreaController.setMessage(R.string.kg_prompt_reason_timeout_pattern);

                resId = R.string.kg_prompt_reason_timeout_pattern;

                break;

        }

        if (resId != 0) {

            mMessageAreaController.setMessage(getResources().getText(resId), /* animate= */ false);

        }

    }



    @Override

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java

+12 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import android.metrics.LogMaker; 
import android.os.SystemClock;

import android.os.UserHandle;

import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.util.Log;

import android.util.MathUtils;

import android.util.Slog;
@@ -64,6 +65,7 @@ import com.android.keyguard.KeyguardSecurityContainer.BouncerUiEvent; 
import com.android.keyguard.KeyguardSecurityContainer.SwipeListener;

import com.android.keyguard.KeyguardSecurityModel.SecurityMode;

import com.android.keyguard.dagger.KeyguardBouncerScope;

import com.android.settingslib.Utils;

import com.android.settingslib.utils.ThreadUtils;

import com.android.systemui.Gefingerpoken;

import com.android.systemui.R;
@@ -634,6 +636,16 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
                mKeyguardStateController.isFaceAuthEnabled());

    }



    /** Sets an initial message that would override the default message */

    public void setInitialMessage() {

        CharSequence customMessage = mViewMediatorCallback.consumeCustomMessage();

        if (!TextUtils.isEmpty(customMessage)) {

            showMessage(customMessage, Utils.getColorError(getContext()));

            return;

        }

        showPromptReason(mViewMediatorCallback.getBouncerPromptReason());

    }



    /**

     * Show the bouncer and start appear animations.

     *

packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardBouncerRepository.kt

+0 −7
Original line number Diff line number Diff line
@@ -65,8 +65,6 @@ interface KeyguardBouncerRepository { 
    val keyguardAuthenticated: StateFlow<Boolean?>

    val showMessage: StateFlow<BouncerShowMessageModel?>

    val resourceUpdateRequests: StateFlow<Boolean>

    val bouncerPromptReason: Int

    val bouncerErrorMessage: CharSequence?

    val alternateBouncerVisible: StateFlow<Boolean>

    val alternateBouncerUIAvailable: StateFlow<Boolean>

    val sideFpsShowing: StateFlow<Boolean>
@@ -145,11 +143,6 @@ constructor( 
    override val showMessage = _showMessage.asStateFlow()

    private val _resourceUpdateRequests = MutableStateFlow(false)

    override val resourceUpdateRequests = _resourceUpdateRequests.asStateFlow()

    override val bouncerPromptReason: Int

        get() = viewMediatorCallback.bouncerPromptReason

    override val bouncerErrorMessage: CharSequence?

        get() = viewMediatorCallback.consumeCustomMessage()



    /** Values associated with the AlternateBouncer */

    private val _alternateBouncerVisible = MutableStateFlow(false)

    override val alternateBouncerVisible = _alternateBouncerVisible.asStateFlow()

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractor.kt

+1 −8
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import com.android.keyguard.KeyguardConstants 
import com.android.keyguard.KeyguardSecurityModel

import com.android.keyguard.KeyguardUpdateMonitor

import com.android.keyguard.KeyguardUpdateMonitorCallback

import com.android.settingslib.Utils

import com.android.systemui.DejankUtils

import com.android.systemui.R

import com.android.systemui.classifier.FalsingCollector
@@ -42,12 +41,12 @@ import com.android.systemui.plugins.ActivityStarter 
import com.android.systemui.shared.system.SysUiStatsLog

import com.android.systemui.statusbar.phone.KeyguardBypassController

import com.android.systemui.statusbar.policy.KeyguardStateController

import javax.inject.Inject

import kotlinx.coroutines.flow.Flow

import kotlinx.coroutines.flow.combine

import kotlinx.coroutines.flow.filter

import kotlinx.coroutines.flow.filterNotNull

import kotlinx.coroutines.flow.map

import javax.inject.Inject



/**

 * Encapsulates business logic for interacting with the lock-screen primary (pin/pattern/password)
@@ -82,12 +81,6 @@ constructor( 
    /** Runnable to show the primary bouncer. */

    val showRunnable = Runnable {

        repository.setPrimaryShow(true)

        primaryBouncerView.delegate?.showPromptReason(repository.bouncerPromptReason)

        (repository.bouncerErrorMessage as? String)?.let {

            repository.setShowMessage(

                BouncerShowMessageModel(message = it, Utils.getColorError(context))

            )

        }

        repository.setPrimaryShowingSoon(false)

        primaryBouncerCallbackInteractor.dispatchVisibilityChanged(View.VISIBLE)

    }