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

Commit 0296f232 authored by Beverly's avatar Beverly Committed by Automerger Merge Worker
Browse files

DO NOT MERGE Update active unlock triggers take #2 am: fe7e9e9a 

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



Change-Id: I84325fcbe60dd016931b98c045d77e4162f30b7c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7b4bf53c fe7e9e9a

packages/SystemUI/src/com/android/keyguard/ActiveUnlockConfig.kt

0 → 100644
+147 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.keyguard



import android.content.ContentResolver

import android.database.ContentObserver

import android.net.Uri

import android.os.Handler

import android.os.UserHandle

import android.provider.Settings.Secure.ACTIVE_UNLOCK_ON_BIOMETRIC_FAIL

import android.provider.Settings.Secure.ACTIVE_UNLOCK_ON_UNLOCK_INTENT

import android.provider.Settings.Secure.ACTIVE_UNLOCK_ON_WAKE

import com.android.keyguard.KeyguardUpdateMonitor.getCurrentUser

import com.android.systemui.Dumpable

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Main

import com.android.systemui.dump.DumpManager

import com.android.systemui.util.settings.SecureSettings

import java.io.PrintWriter

import javax.inject.Inject



/**

 * Handles active unlock settings changes.

 */

@SysUISingleton

class ActiveUnlockConfig @Inject constructor(

    @Main private val handler: Handler,

    private val secureSettings: SecureSettings,

    private val contentResolver: ContentResolver,

    dumpManager: DumpManager

) : Dumpable {



    /**

     * Indicates the origin for an active unlock request.

     */

    enum class ACTIVE_UNLOCK_REQUEST_ORIGIN {

        WAKE, UNLOCK_INTENT, BIOMETRIC_FAIL, ASSISTANT

    }



    private var requestActiveUnlockOnWakeup = false

    private var requestActiveUnlockOnUnlockIntent = false

    private var requestActiveUnlockOnBioFail = false



    private val settingsObserver = object : ContentObserver(handler) {

        private val wakeUri: Uri = secureSettings.getUriFor(ACTIVE_UNLOCK_ON_WAKE)

        private val unlockIntentUri: Uri = secureSettings.getUriFor(ACTIVE_UNLOCK_ON_UNLOCK_INTENT)

        private val bioFailUri: Uri = secureSettings.getUriFor(ACTIVE_UNLOCK_ON_BIOMETRIC_FAIL)



        fun register() {

            contentResolver.registerContentObserver(

                    wakeUri,

                    false,

                    this,

                    UserHandle.USER_ALL)

            contentResolver.registerContentObserver(

                    unlockIntentUri,

                    false,

                    this,

                    UserHandle.USER_ALL)

            contentResolver.registerContentObserver(

                    bioFailUri,

                    false,

                    this,

                    UserHandle.USER_ALL)



            onChange(true, ArrayList(), 0, getCurrentUser())

        }



        override fun onChange(

            selfChange: Boolean,

            uris: Collection<Uri>,

            flags: Int,

            userId: Int

        ) {

            if (getCurrentUser() != userId) {

                return

            }



            if (selfChange || uris.contains(wakeUri)) {

                requestActiveUnlockOnWakeup = secureSettings.getIntForUser(

                        ACTIVE_UNLOCK_ON_WAKE, 0, getCurrentUser()) == 1

            }



            if (selfChange || uris.contains(unlockIntentUri)) {

                requestActiveUnlockOnUnlockIntent = secureSettings.getIntForUser(

                        ACTIVE_UNLOCK_ON_UNLOCK_INTENT, 0, getCurrentUser()) == 1

            }



            if (selfChange || uris.contains(bioFailUri)) {

                requestActiveUnlockOnBioFail = secureSettings.getIntForUser(

                        ACTIVE_UNLOCK_ON_BIOMETRIC_FAIL, 0, getCurrentUser()) == 1

            }

        }

    }



    init {

        settingsObserver.register()

        dumpManager.registerDumpable(this)

    }



    /**

     * Whether to trigger active unlock based on where the request is coming from and

     * the current settings.

     */

    fun shouldAllowActiveUnlockFromOrigin(requestOrigin: ACTIVE_UNLOCK_REQUEST_ORIGIN): Boolean {

        return when (requestOrigin) {

            ACTIVE_UNLOCK_REQUEST_ORIGIN.WAKE -> requestActiveUnlockOnWakeup



            ACTIVE_UNLOCK_REQUEST_ORIGIN.UNLOCK_INTENT ->

                requestActiveUnlockOnUnlockIntent || requestActiveUnlockOnWakeup



            ACTIVE_UNLOCK_REQUEST_ORIGIN.BIOMETRIC_FAIL ->

                requestActiveUnlockOnBioFail || requestActiveUnlockOnUnlockIntent ||

                        requestActiveUnlockOnWakeup



            ACTIVE_UNLOCK_REQUEST_ORIGIN.ASSISTANT -> isActiveUnlockEnabled()

        }

    }



    /**

     * If any active unlock triggers are enabled.

     */

    fun isActiveUnlockEnabled(): Boolean {

        return requestActiveUnlockOnWakeup || requestActiveUnlockOnUnlockIntent ||

                requestActiveUnlockOnBioFail

    }



    override fun dump(pw: PrintWriter, args: Array<out String>) {

        pw.println("   requestActiveUnlockOnWakeup=$requestActiveUnlockOnWakeup")

        pw.println("   requestActiveUnlockOnUnlockIntent=$requestActiveUnlockOnUnlockIntent")

        pw.println("   requestActiveUnlockOnBioFail=$requestActiveUnlockOnBioFail")

    }

}
 
 No newline at end of file

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

+4 −4
Original line number Original line Diff line number Diff line
@@ -221,10 +221,10 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
                mKeyguardSecurityCallback.userActivity();

                mKeyguardSecurityCallback.userActivity();

                showMessage(null, null);

                showMessage(null, null);

            }

            }

            if (mUpdateMonitor.isFaceEnrolled()

            if (mUpdateMonitor.isFaceEnrolled()) {

                    && mUpdateMonitor.mRequestActiveUnlockOnUnlockIntent) {

                mUpdateMonitor.requestActiveUnlock(

                mUpdateMonitor.requestActiveUnlock("unlock-intent, reason=swipeUpOnBouncer",

                        ActiveUnlockConfig.ACTIVE_UNLOCK_REQUEST_ORIGIN.UNLOCK_INTENT,

                        true);

                        "swipeUpOnBouncer");

            }

            }

        }

        }

    };

    };

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

+67 −74
Original line number Original line Diff line number Diff line
@@ -248,12 +248,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        }

        }

    }

    }





    public final boolean mRequestActiveUnlockOnAssistant;

    public final boolean mRequestActiveUnlockOnWakeup;

    public final boolean mInitiateActiveUnlockOnWakeup;

    public final boolean mRequestActiveUnlockOnUnlockIntent;

    public final boolean mRequestActiveUnlockOnBioFail;



    private final Context mContext;

    private final Context mContext;

    private final boolean mIsPrimaryUser;

    private final boolean mIsPrimaryUser;

    private final boolean mIsAutomotive;

    private final boolean mIsAutomotive;
@@ -340,6 +334,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
    private int mActiveMobileDataSubscription = SubscriptionManager.INVALID_SUBSCRIPTION_ID;

    private int mActiveMobileDataSubscription = SubscriptionManager.INVALID_SUBSCRIPTION_ID;

    private final Executor mBackgroundExecutor;

    private final Executor mBackgroundExecutor;

    private SensorPrivacyManager mSensorPrivacyManager;

    private SensorPrivacyManager mSensorPrivacyManager;

    private final ActiveUnlockConfig mActiveUnlockConfig;





    /**

    /**

     * Short delay before restarting fingerprint authentication after a successful try. This should

     * Short delay before restarting fingerprint authentication after a successful try. This should
@@ -441,12 +436,12 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        Assert.isMainThread();

        Assert.isMainThread();

        boolean wasTrusted = mUserHasTrust.get(userId, false);

        boolean wasTrusted = mUserHasTrust.get(userId, false);

        mUserHasTrust.put(userId, enabled);

        mUserHasTrust.put(userId, enabled);

        // If there was no change in trusted state, make sure we are not authenticating.

        // If there was no change in trusted state or trust granted, make sure we are not

        // TrustManager sends an onTrustChanged whenever a user unlocks keyguard, for

        // authenticating.  TrustManager sends an onTrustChanged whenever a user unlocks keyguard,

        // this reason we need to make sure to not authenticate.

        // for this reason we need to make sure to not authenticate.

        if (wasTrusted == enabled) {

        if (wasTrusted == enabled || enabled) {

            updateBiometricListeningState(BIOMETRIC_ACTION_STOP);

            updateBiometricListeningState(BIOMETRIC_ACTION_STOP);

        } else if (!enabled) {

        } else {

            updateBiometricListeningState(BIOMETRIC_ACTION_START);

            updateBiometricListeningState(BIOMETRIC_ACTION_START);

        }

        }
@@ -1364,14 +1359,18 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                cb.onTrustAgentErrorMessage(message);

                cb.onTrustAgentErrorMessage(message);

            }

            }

        }

        }



    }

    }





    @VisibleForTesting

    @VisibleForTesting

    void setAssistantVisible(boolean assistantVisible) {

    void setAssistantVisible(boolean assistantVisible) {

        mAssistantVisible = assistantVisible;

        mAssistantVisible = assistantVisible;

        updateBiometricListeningState(BIOMETRIC_ACTION_UPDATE);

        updateBiometricListeningState(BIOMETRIC_ACTION_UPDATE);

        if (mAssistantVisible && mRequestActiveUnlockOnAssistant) {

        if (mAssistantVisible) {

            requestActiveUnlock("assistant", false);

            requestActiveUnlock(

                    ActiveUnlockConfig.ACTIVE_UNLOCK_REQUEST_ORIGIN.ASSISTANT,

                    "assistant",

                    false);

        }

        }

    }

    }
@@ -1518,10 +1517,9 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 




                @Override

                @Override

                public void onAuthenticationFailed() {

                public void onAuthenticationFailed() {

                    if (mRequestActiveUnlockOnBioFail) {

                    requestActiveUnlock(

                        requestActiveUnlock("biometric-failure, extra=fingerprintFailure",

                            ActiveUnlockConfig.ACTIVE_UNLOCK_REQUEST_ORIGIN.BIOMETRIC_FAIL,

                                true);

                            "fingerprintFailure");

                    }

                    handleFingerprintAuthFailed();

                    handleFingerprintAuthFailed();

                }

                }
@@ -1580,14 +1578,13 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 




                @Override

                @Override

                public void onAuthenticationFailed() {

                public void onAuthenticationFailed() {

                    if (shouldRequestActiveUnlockOnFaceError()) {

                        String reason =

                        String reason =

                                mKeyguardBypassController.canBypass() ? "bypass"

                                mKeyguardBypassController.canBypass() ? "bypass"

                                        : mUdfpsBouncerShowing ? "udfpsBouncer" :

                                        : mUdfpsBouncerShowing ? "udfpsBouncer" :

                                                mBouncerFullyShown ? "bouncer" : "udfpsFpDown";

                                                mBouncerFullyShown ? "bouncer" : "udfpsFpDown";

                        requestActiveUnlock("biometric-failure"

                        requestActiveUnlock(

                                + ", extra=faceFailure-" + reason, true);

                                ActiveUnlockConfig.ACTIVE_UNLOCK_REQUEST_ORIGIN.BIOMETRIC_FAIL,

                    }

                                "faceFailure-" + reason);





                    handleFaceAuthFailed();

                    handleFaceAuthFailed();

                    if (mKeyguardBypassController != null) {

                    if (mKeyguardBypassController != null) {
@@ -1617,10 +1614,11 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                    if (mKeyguardBypassController != null) {

                    if (mKeyguardBypassController != null) {

                        mKeyguardBypassController.setUserHasDeviceEntryIntent(false);

                        mKeyguardBypassController.setUserHasDeviceEntryIntent(false);

                    }

                    }

                    if (errMsgId == BiometricFaceConstants.FACE_ERROR_TIMEOUT



                            && shouldRequestActiveUnlockOnFaceError()) {

                    if (errMsgId == BiometricFaceConstants.FACE_ERROR_TIMEOUT) {

                        requestActiveUnlock("biometric-failure"

                        requestActiveUnlock(

                                + ", extra=faceError-" + errMsgId, true);

                                ActiveUnlockConfig.ACTIVE_UNLOCK_REQUEST_ORIGIN.BIOMETRIC_FAIL,

                                "faceError-" + errMsgId);

                    }

                    }

                }

                }
@@ -1628,12 +1626,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                public void onAuthenticationAcquired(int acquireInfo) {

                public void onAuthenticationAcquired(int acquireInfo) {

                    handleFaceAcquired(acquireInfo);

                    handleFaceAcquired(acquireInfo);

                }

                }



                private boolean shouldRequestActiveUnlockOnFaceError() {

                    return mRequestActiveUnlockOnBioFail

                            && (mKeyguardBypassController.canBypass() || mBouncerFullyShown

                            || mUdfpsBouncerShowing || mAuthController.isUdfpsFingerDown());

                }

    };

    };





    @VisibleForTesting

    @VisibleForTesting
@@ -1749,11 +1741,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        Trace.beginSection("KeyguardUpdateMonitor#handleStartedWakingUp");

        Trace.beginSection("KeyguardUpdateMonitor#handleStartedWakingUp");

        Assert.isMainThread();

        Assert.isMainThread();

        updateBiometricListeningState(BIOMETRIC_ACTION_UPDATE);

        updateBiometricListeningState(BIOMETRIC_ACTION_UPDATE);

        if (mRequestActiveUnlockOnWakeup) {

        requestActiveUnlock(ActiveUnlockConfig.ACTIVE_UNLOCK_REQUEST_ORIGIN.WAKE, "wakingUp");

            requestActiveUnlock("wake-unlock");

        } else if (mInitiateActiveUnlockOnWakeup) {

            initiateActiveUnlock("wake-initiate");

        }

        for (int i = 0; i < mCallbacks.size(); i++) {

        for (int i = 0; i < mCallbacks.size(); i++) {

            KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();

            KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();

            if (cb != null) {

            if (cb != null) {
@@ -1882,7 +1870,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
            AuthController authController,

            AuthController authController,

            TelephonyListenerManager telephonyListenerManager,

            TelephonyListenerManager telephonyListenerManager,

            InteractionJankMonitor interactionJankMonitor,

            InteractionJankMonitor interactionJankMonitor,

            LatencyTracker latencyTracker) {

            LatencyTracker latencyTracker,

            ActiveUnlockConfig activeUnlockConfiguration) {

        mContext = context;

        mContext = context;

        mSubscriptionManager = SubscriptionManager.from(context);

        mSubscriptionManager = SubscriptionManager.from(context);

        mTelephonyListenerManager = telephonyListenerManager;

        mTelephonyListenerManager = telephonyListenerManager;
@@ -1899,18 +1888,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        mAuthController = authController;

        mAuthController = authController;

        dumpManager.registerDumpable(getClass().getName(), this);

        dumpManager.registerDumpable(getClass().getName(), this);

        mSensorPrivacyManager = context.getSystemService(SensorPrivacyManager.class);

        mSensorPrivacyManager = context.getSystemService(SensorPrivacyManager.class);



        mActiveUnlockConfig = activeUnlockConfiguration;

        // TODO, b/222459888: add official configurable names to Settings.java

        mRequestActiveUnlockOnWakeup = Settings.Global.getInt(

                mContext.getContentResolver(), "wake-unlock", 0) == 1;

        mInitiateActiveUnlockOnWakeup = Settings.Global.getInt(

                mContext.getContentResolver(), "wake-initiate", 1) == 1;

        mRequestActiveUnlockOnUnlockIntent = Settings.Global.getInt(

                mContext.getContentResolver(), "unlock-intent", 0) == 1;

        mRequestActiveUnlockOnBioFail = Settings.Global.getInt(

                mContext.getContentResolver(), "bio-fail", 0) == 1;

        mRequestActiveUnlockOnAssistant = Settings.Global.getInt(

                mContext.getContentResolver(), "assistant", 0) == 1;





        mHandler = new Handler(mainLooper) {

        mHandler = new Handler(mainLooper) {

            @Override

            @Override
@@ -2292,11 +2270,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        }

        }

        mAuthInterruptActive = active;

        mAuthInterruptActive = active;

        updateFaceListeningState(BIOMETRIC_ACTION_UPDATE);

        updateFaceListeningState(BIOMETRIC_ACTION_UPDATE);

        if (mRequestActiveUnlockOnWakeup) {

        requestActiveUnlock(ActiveUnlockConfig.ACTIVE_UNLOCK_REQUEST_ORIGIN.WAKE, "onReach");

            requestActiveUnlock("wake-unlock, extra=onReach");

        } else if (mInitiateActiveUnlockOnWakeup) {

            initiateActiveUnlock("wake-initiate, extra=onReach");

        }

    }

    }





    /**

    /**
@@ -2348,7 +2322,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
    /**

    /**

     * Initiates active unlock to get the unlock token ready.

     * Initiates active unlock to get the unlock token ready.

     */

     */

    public void initiateActiveUnlock(String reason) {

    private void initiateActiveUnlock(String reason) {

        // If this message exists, FP has already authenticated, so wait until that is handled

        // If this message exists, FP has already authenticated, so wait until that is handled

        if (mHandler.hasMessages(MSG_BIOMETRIC_AUTHENTICATION_CONTINUE)) {

        if (mHandler.hasMessages(MSG_BIOMETRIC_AUTHENTICATION_CONTINUE)) {

            return;

            return;
@@ -2365,15 +2339,30 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
    /**

    /**

     * Attempts to trigger active unlock from trust agent.

     * Attempts to trigger active unlock from trust agent.

     */

     */

    public void requestActiveUnlock(String reason, boolean dismissKeyguard) {

    private void requestActiveUnlock(

            ActiveUnlockConfig.ACTIVE_UNLOCK_REQUEST_ORIGIN requestOrigin,

            String reason,

            boolean dismissKeyguard

    ) {

        // If this message exists, FP has already authenticated, so wait until that is handled

        // If this message exists, FP has already authenticated, so wait until that is handled

        if (mHandler.hasMessages(MSG_BIOMETRIC_AUTHENTICATION_CONTINUE)) {

        if (mHandler.hasMessages(MSG_BIOMETRIC_AUTHENTICATION_CONTINUE)) {

            return;

            return;

        }

        }





        if (shouldTriggerActiveUnlock()) {

        final boolean allowRequest =

                mActiveUnlockConfig.shouldAllowActiveUnlockFromOrigin(requestOrigin);

        if (requestOrigin == ActiveUnlockConfig.ACTIVE_UNLOCK_REQUEST_ORIGIN.WAKE

                && !allowRequest && mActiveUnlockConfig.isActiveUnlockEnabled()) {

            // instead of requesting the active unlock, initiate the unlock

            initiateActiveUnlock(reason);

            return;

        }



        if (allowRequest && shouldTriggerActiveUnlock()) {

            if (DEBUG) {

            if (DEBUG) {

                Log.d("ActiveUnlock", "reportUserRequestedUnlock triggerReason=" + reason

                Log.d("ActiveUnlock", "reportUserRequestedUnlock"

                        + " origin=" + requestOrigin.name()

                        + " reason=" + reason

                        + " dismissKeyguard=" + dismissKeyguard);

                        + " dismissKeyguard=" + dismissKeyguard);

            }

            }

            mTrustManager.reportUserRequestedUnlock(KeyguardUpdateMonitor.getCurrentUser(),

            mTrustManager.reportUserRequestedUnlock(KeyguardUpdateMonitor.getCurrentUser(),
@@ -2383,11 +2372,20 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 




    /**

    /**

     * Attempts to trigger active unlock from trust agent.

     * Attempts to trigger active unlock from trust agent.

     * Only dismisses the keyguard if only face is enrolled (no FP) and bypass is enabled.

     * Only dismisses the keyguard under certain conditions.

     */

     */

    public void requestActiveUnlock(String reason) {

    public void requestActiveUnlock(

        requestActiveUnlock(reason, isFaceEnrolled() && !isUdfpsEnrolled()

            ActiveUnlockConfig.ACTIVE_UNLOCK_REQUEST_ORIGIN requestOrigin,

                && mKeyguardBypassController.getBypassEnabled());

            String extraReason

    ) {

        final boolean canFaceBypass = isFaceEnrolled() && mKeyguardBypassController != null

                && mKeyguardBypassController.canBypass();

        requestActiveUnlock(

                requestOrigin,

                extraReason, canFaceBypass

                        || mUdfpsBouncerShowing

                        || mBouncerFullyShown

                        || mAuthController.isUdfpsFingerDown());

    }

    }





    /**

    /**
@@ -2397,9 +2395,9 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        mUdfpsBouncerShowing = showing;

        mUdfpsBouncerShowing = showing;

        if (mUdfpsBouncerShowing) {

        if (mUdfpsBouncerShowing) {

            updateFaceListeningState(BIOMETRIC_ACTION_START);

            updateFaceListeningState(BIOMETRIC_ACTION_START);

            if (mRequestActiveUnlockOnUnlockIntent) {

            requestActiveUnlock(

                requestActiveUnlock("unlock-intent, extra=udfpsBouncer", true);

                    ActiveUnlockConfig.ACTIVE_UNLOCK_REQUEST_ORIGIN.UNLOCK_INTENT,

            }

                    "udfpsBouncer");

        }

        }

    }

    }
@@ -3233,8 +3231,10 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        }

        }





        if (wasBouncerFullyShown != mBouncerFullyShown) {

        if (wasBouncerFullyShown != mBouncerFullyShown) {

            if (mBouncerFullyShown && mRequestActiveUnlockOnUnlockIntent) {

            if (mBouncerFullyShown) {

                requestActiveUnlock("unlock-intent, reason=bouncerFullyShown", true);

                requestActiveUnlock(

                        ActiveUnlockConfig.ACTIVE_UNLOCK_REQUEST_ORIGIN.UNLOCK_INTENT,

                        "bouncerFullyShown");

            }

            }

            for (int i = 0; i < mCallbacks.size(); i++) {

            for (int i = 0; i < mCallbacks.size(); i++) {

                KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();

                KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();
@@ -3771,13 +3771,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        }

        }

        mListenModels.print(pw);

        mListenModels.print(pw);





        pw.println("Enabled active unlock triggers:");

        pw.println("   mRequestActiveUnlockOnWakeup=" + mRequestActiveUnlockOnWakeup);

        pw.println("   mInitiateActiveUnlockOnWakeup=" + mInitiateActiveUnlockOnWakeup);

        pw.println("   mRequestActiveUnlockOnUnlockIntent=" + mRequestActiveUnlockOnUnlockIntent);

        pw.println("   mRequestActiveUnlockOnBiometricFail=" + mRequestActiveUnlockOnBioFail);

        pw.println("   mRequestActiveUnlockOnAssistant=" + mRequestActiveUnlockOnAssistant);



        if (mIsAutomotive) {

        if (mIsAutomotive) {

            pw.println("  Running on Automotive build");

            pw.println("  Running on Automotive build");

        }

        }

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java

+12 −6
Original line number Original line Diff line number Diff line
@@ -51,6 +51,7 @@ import android.view.accessibility.AccessibilityManager; 




import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.LatencyTracker;

import com.android.internal.util.LatencyTracker;

import com.android.keyguard.ActiveUnlockConfig;

import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.systemui.animation.ActivityLaunchAnimator;

import com.android.systemui.animation.ActivityLaunchAnimator;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dagger.SysUISingleton;
@@ -658,9 +659,15 @@ public class UdfpsController implements DozeReceiver { 
        mExecution.assertIsMainThread();

        mExecution.assertIsMainThread();





        mOverlay = overlay;

        mOverlay = overlay;

        final int requestReason = overlay.getRequestReason();

        if (requestReason == REASON_AUTH_KEYGUARD

                && !mKeyguardUpdateMonitor.isFingerprintDetectionRunning()) {

            Log.d(TAG, "Attempting to showUdfpsOverlay when fingerprint detection"

                    + " isn't running on keyguard. Skip show.");

            return;

        }

        if (overlay.show(this, mOverlayParams)) {

        if (overlay.show(this, mOverlayParams)) {

            Log.v(TAG, "showUdfpsOverlay | adding window reason="

            Log.v(TAG, "showUdfpsOverlay | adding window reason=" + requestReason);

                    + overlay.getRequestReason());

            mOnFingerDown = false;

            mOnFingerDown = false;

            mAttemptedToDismissKeyguard = false;

            mAttemptedToDismissKeyguard = false;

            mOrientationListener.enable();

            mOrientationListener.enable();
@@ -791,10 +798,9 @@ public class UdfpsController implements DozeReceiver { 
                mKeyguardUpdateMonitor.requestFaceAuth(/* userInitiatedRequest */ false);

                mKeyguardUpdateMonitor.requestFaceAuth(/* userInitiatedRequest */ false);

            }

            }





            if (mKeyguardUpdateMonitor.mRequestActiveUnlockOnUnlockIntent) {

            mKeyguardUpdateMonitor.requestActiveUnlock(

                mKeyguardUpdateMonitor.requestActiveUnlock("unlock-intent extra=udfpsFingerDown",

                    ActiveUnlockConfig.ACTIVE_UNLOCK_REQUEST_ORIGIN.UNLOCK_INTENT,

                        true);

                    "udfpsFingerDown");

            }

        }

        }

        mOnFingerDown = true;

        mOnFingerDown = true;

        if (mAlternateTouchProvider != null) {

        if (mAlternateTouchProvider != null) {

packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -510,7 +510,8 @@ public class KeyguardIndicationController { 
                            .setMessage(trustGrantedIndication)

                            .setMessage(trustGrantedIndication)

                            .setTextColor(mInitialTextColorState)

                            .setTextColor(mInitialTextColorState)

                            .build(),

                            .build(),

                    false);

                    true);

            hideBiometricMessage();

        } else if (!TextUtils.isEmpty(trustManagedIndication)

        } else if (!TextUtils.isEmpty(trustManagedIndication)

                && mKeyguardUpdateMonitor.getUserTrustIsManaged(userId)

                && mKeyguardUpdateMonitor.getUserTrustIsManaged(userId)

                && !userHasTrust) {

                && !userHasTrust) {