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

Unverified Commit 202c2c0e authored by Michael Bestas's avatar Michael Bestas Committed by Michael Bestas
Browse files

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

Replaced by AOSP implementation

This reverts commit 9a7dc3fa.

Change-Id: I2dba8ff3fe167eaea472f54b44498eba50330c65
parent 943708cb

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

+3 −36
Original line number Diff line number Diff line
@@ -154,8 +154,6 @@ import com.android.systemui.util.Assert; 


import com.google.android.collect.Lists;



import lineageos.providers.LineageSettings;



import java.io.PrintWriter;

import java.lang.ref.WeakReference;

import java.util.ArrayList;
@@ -339,7 +337,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
            mCallbacks = Lists.newArrayList();

    private ContentObserver mDeviceProvisionedObserver;

    private ContentObserver mTimeFormatChangeObserver;

    private ContentObserver mSettingsChangeObserver;



    private boolean mSwitchingUser;
@@ -368,7 +365,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
    private final PowerManager mPowerManager;

    private final boolean mWakeOnFingerprintAcquiredStart;



    private boolean mFingerprintWakeAndUnlock;

    private final boolean mFingerprintWakeAndUnlock;



    /**

     * Short delay before restarting fingerprint authentication after a successful try. This should
@@ -1924,6 +1921,8 @@ 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;
@@ -1949,8 +1948,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                .boxed()

                .collect(Collectors.toSet());



        updateFingerprintSettings();



        mHandler = new Handler(mainLooper) {

            @Override

            public void handleMessage(Message msg) {
@@ -2198,32 +2195,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        mContext.getContentResolver().registerContentObserver(

                Settings.System.getUriFor(Settings.System.TIME_12_24),

                false, mTimeFormatChangeObserver, UserHandle.USER_ALL);



        mSettingsChangeObserver = new ContentObserver(mHandler) {

            @Override

            public void onChange(boolean selfChange) {

                updateFingerprintSettings();

            }

        };

        mContext.getContentResolver().registerContentObserver(

                LineageSettings.System.getUriFor(LineageSettings.System.FINGERPRINT_WAKE_UNLOCK),

                false, mSettingsChangeObserver, UserHandle.USER_ALL);

    }



    private void updateFingerprintSettings() {

        boolean defFingerprintSettings = mContext.getResources().getBoolean(

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

        if (defFingerprintSettings) {

            mFingerprintWakeAndUnlock = LineageSettings.System.getIntForUser(

                    mContext.getContentResolver(), LineageSettings.System.FINGERPRINT_WAKE_UNLOCK,

                    1, UserHandle.USER_CURRENT) == 1;

        } else {

            mFingerprintWakeAndUnlock = defFingerprintSettings;

            // if its false, the device meant to be used like that, disable toggle with 2.

            LineageSettings.System.putIntForUser(mContext.getContentResolver(),

                    LineageSettings.System.FINGERPRINT_WAKE_UNLOCK,

                    2, UserHandle.USER_CURRENT);

        }

    }



    private void updateFaceEnrolled(int userId) {
@@ -3742,10 +3713,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
            mContext.getContentResolver().unregisterContentObserver(mTimeFormatChangeObserver);

        }



        if (mSettingsChangeObserver != null) {

            mContext.getContentResolver().unregisterContentObserver(mSettingsChangeObserver);

        }



        try {

            ActivityManager.getService().unregisterUserSwitchObserver(mUserSwitchObserver);

        } catch (RemoteException e) {