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

Unverified Commit 4a348004 authored by Michael Bestas's avatar Michael Bestas Committed by Michael Bestas
Browse files

Revert "Keyguard: Allow disabling fingerprint wake-and-unlock" 

Conflicts with QPR2 implementation

This reverts commit a56ccf3a.

Change-Id: I5082e4e43522c03df51b9a534d5fd33ecfde540e
parent 202c2c0e

packages/SystemUI/res/values/lineage_config.xml

+0 −6
Original line number Diff line number Diff line
@@ -19,12 +19,6 @@ 
    <integer name="config_maxVisibleNotificationIcons">4</integer>

    <integer name="config_maxVisibleNotificationIconsOnLock">3</integer>



    <!-- Should we listen for fingerprints when the screen is off?  Devices

         with a rear-mounted sensor want this, but certain devices have

         the sensor embedded in the power key and listening all the time

         causes a poor experience. -->

    <bool name="config_fingerprintWakeAndUnlock">true</bool>



    <!-- Color of the UDFPS pressed view -->

    <color name="config_udfpsColor">#ffffffff</color>

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

+1 −17
Original line number Diff line number Diff line
@@ -365,8 +365,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
    private final PowerManager mPowerManager;

    private final boolean mWakeOnFingerprintAcquiredStart;



    private final boolean mFingerprintWakeAndUnlock;



    /**

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

     * be slightly longer than the time between onFingerprintAuthenticated and
@@ -1921,8 +1919,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        mTelephonyListenerManager = telephonyListenerManager;

        mDeviceProvisioned = isDeviceProvisionedInSettingsDb();

        mStrongAuthTracker = new StrongAuthTracker(context, this::notifyStrongAuthStateChanged);

        mFingerprintWakeAndUnlock = mContext.getResources().getBoolean(

                com.android.systemui.R.bool.config_fingerprintWakeAndUnlock);

        mBackgroundExecutor = backgroundExecutor;

        mBroadcastDispatcher = broadcastDispatcher;

        mInteractionJankMonitor = interactionJankMonitor;
@@ -2525,18 +2521,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        final int user = getCurrentUser();

        final boolean userDoesNotHaveTrust = !getUserHasTrust(user);

        final boolean shouldListenForFingerprintAssistant = shouldListenForFingerprintAssistant();

        final boolean shouldListenKeyguardState;

        if (!mFingerprintWakeAndUnlock) {

            shouldListenKeyguardState =

                (mKeyguardIsVisible

                        || mBouncerIsOrWillBeShowing

                        || shouldListenForFingerprintAssistant

                        || (mKeyguardOccluded && mIsDreaming))

                        && mDeviceInteractive && !mGoingToSleep && !mKeyguardGoingAway

                        || (mKeyguardOccluded && userDoesNotHaveTrust

                            && (mOccludingAppRequestingFp || isUdfps));

        } else {

            shouldListenKeyguardState =

        final boolean shouldListenKeyguardState =

                mKeyguardIsVisible

                        || !mDeviceInteractive

                        || (mBouncerIsOrWillBeShowing && !mKeyguardGoingAway)
@@ -2545,7 +2530,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                        || (mKeyguardOccluded && mIsDreaming)

                        || (mKeyguardOccluded && userDoesNotHaveTrust

                            && (mOccludingAppRequestingFp || isUdfps));

        }



        // Only listen if this KeyguardUpdateMonitor belongs to the primary user. There is an

        // instance of KeyguardUpdateMonitor for each user but KeyguardUpdateMonitor is user-aware.