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

Commit 68bb4d4a authored by Michael Bestas's avatar Michael Bestas
Browse files

Revert "Keyguard: Allow user configurable fingerprint wake-and-unlock" 

Replaced by a much simpler implementation.

This reverts commit 01648902.

Change-Id: I17172c51f464979a1cca6d787baaf286ae4def3d
parent a9ecc905

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

+1 −44
Original line number Diff line number Diff line
@@ -335,7 +335,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
            mCallbacks = Lists.newArrayList();

    private ContentObserver mDeviceProvisionedObserver;

    private final ContentObserver mTimeFormatChangeObserver;

    private ContentObserver mSettingsChangeObserver;



    private boolean mSwitchingUser;
@@ -377,8 +376,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
    private int mPostureState = DEVICE_POSTURE_UNKNOWN;

    private FingerprintInteractiveToAuthProvider mFingerprintInteractiveToAuthProvider;



    private boolean mFingerprintWakeAndUnlock;



    /**

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

     * be slightly longer than the time between onFingerprintAuthenticated and
@@ -2186,8 +2183,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                R.integer.config_face_auth_supported_posture);

        mFaceWakeUpTriggersConfig = faceWakeUpTriggersConfig;



        updateFingerprintSettings();



        mHandler = new Handler(mainLooper) {

            @Override

            public void handleMessage(Message msg) {
@@ -2413,28 +2408,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                false, mTimeFormatChangeObserver, UserHandle.USER_ALL);



        mFingerprintInteractiveToAuthProvider = interactiveToAuthProvider.orElse(null);



        mSettingsChangeObserver = new ContentObserver(mHandler) {

            @Override

            public void onChange(boolean selfChange) {

                updateFingerprintSettings();

            }

        };

        mContext.getContentResolver().registerContentObserver(

                Settings.Secure.getUriFor(Settings.Secure.SFPS_PERFORMANT_AUTH_ENABLED),

                false, mSettingsChangeObserver, UserHandle.USER_ALL);

    }



    private void updateFingerprintSettings() {

        boolean defFingerprintSettings = mContext.getResources().getBoolean(

                org.lineageos.platform.internal.R.bool.config_fingerprintWakeAndUnlock);

        if (defFingerprintSettings) {

            mFingerprintWakeAndUnlock = Settings.Secure.getIntForUser(mContext.getContentResolver(),

                    Settings.Secure.SFPS_PERFORMANT_AUTH_ENABLED,

                    1, UserHandle.USER_CURRENT) == 1;

        } else {

            mFingerprintWakeAndUnlock = defFingerprintSettings;

        }

    }



    private void initializeSimState() {
@@ -2832,18 +2805,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 =

                (isKeyguardVisible()

                        || mPrimaryBouncerIsOrWillBeShowing

                        || shouldListenForFingerprintAssistant

                        || (mKeyguardOccluded && mIsDreaming))

                        && mDeviceInteractive && !mGoingToSleep && !mKeyguardGoingAway

                        || (mKeyguardOccluded && userDoesNotHaveTrust

                            && (mOccludingAppRequestingFp || isUdfps || mAlternateBouncerShowing));

        } else {

            shouldListenKeyguardState =

        final boolean shouldListenKeyguardState =

                isKeyguardVisible()

                        || !mDeviceInteractive

                        || (mPrimaryBouncerIsOrWillBeShowing && !mKeyguardGoingAway)
@@ -2852,7 +2814,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                        || (mKeyguardOccluded && mIsDreaming)

                        || (mKeyguardOccluded && userDoesNotHaveTrust

                            && (mOccludingAppRequestingFp || isUdfps || mAlternateBouncerShowing));

        }



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

        // instance of KeyguardUpdateMonitor for each user but KeyguardUpdateMonitor is user-aware.
@@ -4061,10 +4022,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
            mContext.getContentResolver().unregisterContentObserver(mTimeFormatChangeObserver);

        }



        if (mSettingsChangeObserver != null) {

            mContext.getContentResolver().unregisterContentObserver(mSettingsChangeObserver);

        }



        mUserTracker.removeCallback(mUserChangedCallback);



        TaskStackChangeListeners.getInstance().unregisterTaskStackListener(mTaskStackListener);