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

Commit 16d7245b authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "Prevent Fingerprint when SIM is locked" into mnc-dr-dev

parents fd538001 733b663c

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

+4 −2
Original line number Diff line number Diff line
@@ -523,7 +523,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 
        final DevicePolicyManager dpm =

                (DevicePolicyManager) mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);

        return dpm != null && (dpm.getKeyguardDisabledFeatures(null, userId)

                    & DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT) != 0;

                    & DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT) != 0

                || isSimPinSecure();

    }



    public boolean getUserCanSkipBouncer(int userId) {
@@ -1016,7 +1017,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 


    private boolean shouldListenForFingerprint() {

        return (mKeyguardIsVisible || !mDeviceInteractive) && !mSwitchingUser

                && !mFingerprintAlreadyAuthenticated;

                && !mFingerprintAlreadyAuthenticated && !isFingerprintDisabled(getCurrentUser());

    }



    private void startListeningForFingerprint() {
@@ -1090,6 +1091,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 
     * Handle {@link #MSG_DPM_STATE_CHANGED}

     */

    protected void handleDevicePolicyManagerStateChanged() {

        updateFingerprintListeningState();

        for (int i = mCallbacks.size() - 1; i >= 0; i--) {

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

            if (cb != null) {