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

Commit cf5dace3 authored by Beverly's avatar Beverly Committed by Beverly Tai
Browse files

Immediately stop running face auth if the display is OFF 

And prevent face auth from running if the display is OFF.

Only prevent running face auth based on the display state
if the feature flag 'flag_stop_face_auth_on_display_off" is
enabled. In general, face auth relies on the "waking up"
and "going to sleep" signals. That said, when the device
starts "waking up", immediately update the allowedDisplayState
to TRUE to pre-emptively prep for the display state changing to
ON, since display state changes do not START face auth again.

Also fixes out of order KeyguardFaceListenModel.

Test: atest KeyguardUpdateMonitortest
Test: manual
Bug: 290077758
Bug: 294221702
Change-Id: Ie68db6a998fdff1c8b2b79d75650f999bcc55c13
Merged-In: Ie68db6a998fdff1c8b2b79d75650f999bcc55c13
parent e1f15885

packages/SystemUI/res/values/flags.xml

+2 −0
Original line number Diff line number Diff line
@@ -38,4 +38,6 @@ 
         protected. -->

    <bool name="flag_battery_shield_icon">false</bool>



    <!-- Whether face auth will immediately stop when the display state is OFF -->

    <bool name="flag_stop_face_auth_on_display_off">false</bool>

</resources>

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

+4 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import com.android.keyguard.InternalFaceAuthReasons.AUTH_REQUEST_DURING_CANCELLA 
import com.android.keyguard.InternalFaceAuthReasons.BIOMETRIC_ENABLED

import com.android.keyguard.InternalFaceAuthReasons.CAMERA_LAUNCHED

import com.android.keyguard.InternalFaceAuthReasons.DEVICE_WOKEN_UP_ON_REACH_GESTURE

import com.android.keyguard.InternalFaceAuthReasons.DISPLAY_OFF

import com.android.keyguard.InternalFaceAuthReasons.DREAM_STARTED

import com.android.keyguard.InternalFaceAuthReasons.DREAM_STOPPED

import com.android.keyguard.InternalFaceAuthReasons.ENROLLMENTS_CHANGED
@@ -131,6 +132,7 @@ private object InternalFaceAuthReasons { 
    const val NON_STRONG_BIOMETRIC_ALLOWED_CHANGED =

        "Face auth stopped because non strong biometric allowed changed"

    const val POSTURE_CHANGED = "Face auth started/stopped due to device posture changed."

    const val DISPLAY_OFF = "Face auth stopped due to display state OFF."

}



/**
@@ -221,7 +223,8 @@ constructor(private val id: Int, val reason: String, var extraInfo: Int = 0) : 
    FACE_AUTH_UPDATED_STRONG_AUTH_CHANGED(1255, STRONG_AUTH_ALLOWED_CHANGED),

    @UiEvent(doc = NON_STRONG_BIOMETRIC_ALLOWED_CHANGED)

    FACE_AUTH_NON_STRONG_BIOMETRIC_ALLOWED_CHANGED(1256, NON_STRONG_BIOMETRIC_ALLOWED_CHANGED),

    @UiEvent(doc = ACCESSIBILITY_ACTION) FACE_AUTH_ACCESSIBILITY_ACTION(1454, ACCESSIBILITY_ACTION);

    @UiEvent(doc = ACCESSIBILITY_ACTION) FACE_AUTH_ACCESSIBILITY_ACTION(1454, ACCESSIBILITY_ACTION),

    @UiEvent(doc = DISPLAY_OFF) FACE_AUTH_DISPLAY_OFF(1461, DISPLAY_OFF);



    override fun getId(): Int = this.id

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

+7 −3
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ data class KeyguardFaceListenModel( 
    override var userId: Int = 0,

    override var listening: Boolean = false,

    // keep sorted

    var allowedDisplayState: Boolean = false,

    var alternateBouncerShowing: Boolean = false,

    var authInterruptActive: Boolean = false,

    var biometricSettingEnabledForUser: Boolean = false,
@@ -57,6 +58,8 @@ data class KeyguardFaceListenModel( 
            userId.toString(),

            listening.toString(),

            // keep sorted

            allowedDisplayState.toString(),

            alternateBouncerShowing.toString(),

            authInterruptActive.toString(),

            biometricSettingEnabledForUser.toString(),

            bouncerFullyShown.toString(),
@@ -74,7 +77,6 @@ data class KeyguardFaceListenModel( 
            supportsDetect.toString(),

            switchingUser.toString(),

            systemUser.toString(),

            alternateBouncerShowing.toString(),

            udfpsFingerDown.toString(),

            userNotTrustedOrDetectionIsNeeded.toString(),

        )
@@ -96,7 +98,9 @@ data class KeyguardFaceListenModel( 
                userId = model.userId

                listening = model.listening

                // keep sorted

                allowedDisplayState = model.allowedDisplayState

                alternateBouncerShowing = model.alternateBouncerShowing

                authInterruptActive = model.authInterruptActive

                biometricSettingEnabledForUser = model.biometricSettingEnabledForUser

                bouncerFullyShown = model.bouncerFullyShown

                faceAndFpNotAuthenticated = model.faceAndFpNotAuthenticated
@@ -105,7 +109,6 @@ data class KeyguardFaceListenModel( 
                faceLockedOut = model.faceLockedOut

                goingToSleep = model.goingToSleep

                keyguardAwake = model.keyguardAwake

                goingToSleep = model.goingToSleep

                keyguardGoingAway = model.keyguardGoingAway

                listeningForFaceAssistant = model.listeningForFaceAssistant

                occludingAppRequestingFaceAuth = model.occludingAppRequestingFaceAuth
@@ -140,6 +143,8 @@ data class KeyguardFaceListenModel( 
                "userId",

                "listening",

                // keep sorted

                "allowedDisplayState",

                "alternateBouncerShowing",

                "authInterruptActive",

                "biometricSettingEnabledForUser",

                "bouncerFullyShown",
@@ -157,7 +162,6 @@ data class KeyguardFaceListenModel( 
                "supportsDetect",

                "switchingUser",

                "systemUser",

                "udfpsBouncerShowing",

                "udfpsFingerDown",

                "userNotTrustedOrDetectionIsNeeded",

            )

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

+38 −2
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STR 
import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_LOCKOUT;

import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN;

import static com.android.keyguard.FaceAuthReasonKt.apiRequestReasonToUiEvent;

import static com.android.keyguard.FaceAuthUiEvent.FACE_AUTH_DISPLAY_OFF;

import static com.android.keyguard.FaceAuthUiEvent.FACE_AUTH_NON_STRONG_BIOMETRIC_ALLOWED_CHANGED;

import static com.android.keyguard.FaceAuthUiEvent.FACE_AUTH_STOPPED_DREAM_STARTED;

import static com.android.keyguard.FaceAuthUiEvent.FACE_AUTH_STOPPED_FACE_CANCEL_NOT_RECEIVED;
@@ -131,6 +132,7 @@ import android.telephony.TelephonyManager; 
import android.text.TextUtils;

import android.util.SparseArray;

import android.util.SparseBooleanArray;

import android.view.Display;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;
@@ -155,6 +157,8 @@ import com.android.systemui.dagger.qualifiers.Background; 
import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.dump.DumpsysTableLogger;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.flags.Flags;

import com.android.systemui.keyguard.domain.interactor.FaceAuthenticationListener;

import com.android.systemui.keyguard.domain.interactor.KeyguardFaceAuthInteractor;

import com.android.systemui.keyguard.shared.constants.TrustAgentUiEvent;
@@ -169,6 +173,7 @@ import com.android.systemui.keyguard.shared.model.SysUiFaceAuthenticateOptions; 
import com.android.systemui.log.SessionTracker;

import com.android.systemui.plugins.WeatherData;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.settings.DisplayTracker;

import com.android.systemui.settings.UserTracker;

import com.android.systemui.shared.system.TaskStackChangeListener;

import com.android.systemui.shared.system.TaskStackChangeListeners;
@@ -327,6 +332,25 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
            }

        }

    };

    private final DisplayTracker.Callback mDisplayCallback = new DisplayTracker.Callback() {

        @Override

        public void onDisplayChanged(int displayId) {

            if (displayId != Display.DEFAULT_DISPLAY) {

                return;

            }



            if (mDisplayTracker.getDisplay(mDisplayTracker.getDefaultDisplayId()).getState()

                    == Display.STATE_OFF) {

                mAllowedDisplayStateForFaceAuth = false;

                updateFaceListeningState(

                        BIOMETRIC_ACTION_STOP,

                        FACE_AUTH_DISPLAY_OFF

                );

            } else {

                mAllowedDisplayStateForFaceAuth = true;

            }

        }

    };

    private final FaceWakeUpTriggersConfig mFaceWakeUpTriggersConfig;



    HashMap<Integer, SimData> mSimDatas = new HashMap<>();
@@ -347,6 +371,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
    private boolean mOccludingAppRequestingFp;

    private boolean mOccludingAppRequestingFace;

    private boolean mSecureCameraLaunched;

    private boolean mAllowedDisplayStateForFaceAuth = true;

    @VisibleForTesting

    protected boolean mTelephonyCapable;
@@ -391,6 +416,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
    private final FaceManager mFaceManager;

    @Nullable

    private KeyguardFaceAuthInteractor mFaceAuthInteractor;

    private final DisplayTracker mDisplayTracker;

    private final LockPatternUtils mLockPatternUtils;

    @VisibleForTesting

    @DevicePostureInt
@@ -2186,6 +2212,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        Trace.beginSection("KeyguardUpdateMonitor#handleStartedWakingUp");

        Assert.isMainThread();



        mAllowedDisplayStateForFaceAuth = true;

        updateFingerprintListeningState(BIOMETRIC_ACTION_UPDATE);

        if (mFaceWakeUpTriggersConfig.shouldTriggerFaceAuthOnWakeUpFrom(pmWakeReason)) {

            FACE_AUTH_UPDATED_STARTED_WAKING_UP.setExtraInfo(pmWakeReason);
@@ -2338,7 +2365,9 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
            @Nullable BiometricManager biometricManager,

            FaceWakeUpTriggersConfig faceWakeUpTriggersConfig,

            DevicePostureController devicePostureController,

            Optional<FingerprintInteractiveToAuthProvider> interactiveToAuthProvider) {

            Optional<FingerprintInteractiveToAuthProvider> interactiveToAuthProvider,

            FeatureFlags featureFlags,

            DisplayTracker displayTracker) {

        mContext = context;

        mSubscriptionManager = subscriptionManager;

        mUserTracker = userTracker;
@@ -2379,6 +2408,10 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        mConfigFaceAuthSupportedPosture = mContext.getResources().getInteger(

                R.integer.config_face_auth_supported_posture);

        mFaceWakeUpTriggersConfig = faceWakeUpTriggersConfig;

        mDisplayTracker = displayTracker;

        if (featureFlags.isEnabled(Flags.STOP_FACE_AUTH_ON_DISPLAY_OFF)) {

            mDisplayTracker.addDisplayChangeCallback(mDisplayCallback, mainExecutor);

        }



        mHandler = new Handler(mainLooper) {

            @Override
@@ -3185,7 +3218,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                && (!mSecureCameraLaunched || mAlternateBouncerShowing)

                && faceAndFpNotAuthenticated

                && !mGoingToSleep

                && isPostureAllowedForFaceAuth;

                && isPostureAllowedForFaceAuth

                && mAllowedDisplayStateForFaceAuth;



        // Aggregate relevant fields for debug logging.

        logListenerModelData(
@@ -3193,6 +3227,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                    System.currentTimeMillis(),

                    user,

                    shouldListen,

                    mAllowedDisplayStateForFaceAuth,

                    mAlternateBouncerShowing,

                    mAuthInterruptActive,

                    biometricEnabledForUser,
@@ -4337,6 +4372,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 


        mLockPatternUtils.unregisterStrongAuthTracker(mStrongAuthTracker);

        mTrustManager.unregisterTrustListener(this);

        mDisplayTracker.removeCallback(mDisplayCallback);



        mHandler.removeCallbacksAndMessages(null);

    }

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+5 −0
Original line number Diff line number Diff line
@@ -268,6 +268,11 @@ object Flags { 
    @JvmField

    val KEYGUARD_TALKBACK_FIX = releasedFlag(238, "keyguard_talkback_fix")



    /** Stop running face auth when the display state changes to OFF. */

    // TODO(b/294221702): Tracking bug.

    @JvmField val STOP_FACE_AUTH_ON_DISPLAY_OFF = resourceBooleanFlag(245,

            R.bool.flag_stop_face_auth_on_display_off, "stop_face_auth_on_display_off")



    // 300 - power menu

    // TODO(b/254512600): Tracking Bug

    @JvmField val POWER_MENU_LITE = releasedFlag(300, "power_menu_lite")