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

Commit 75a93eae authored by Joshua McCloskey's avatar Joshua McCloskey Committed by Android Build Coastguard Worker
Browse files

Updated keyguard to be robust against fpm 

Test: Manual
Bug: 241084172
Change-Id: If51313b03dc40442ad6c42603f77579e77b0c873
Merged-In: If51313b03dc40442ad6c42603f77579e77b0c873
(cherry picked from commit bfd27670)
Merged-In: If51313b03dc40442ad6c42603f77579e77b0c873
parent a0eddecc

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

+10 −0
Original line number Diff line number Diff line
@@ -751,6 +751,11 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 


    private void handleFingerprintAuthFailed() {

        Assert.isMainThread();

        if (mHandler.hasCallbacks(mFpCancelNotReceived)) {

            Log.d(TAG, "handleFingerprintAuthFailed()"

                    + " triggered while waiting for cancellation, removing watchdog");

            mHandler.removeCallbacks(mFpCancelNotReceived);

        }

        for (int i = 0; i < mCallbacks.size(); i++) {

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

            if (cb != null) {
@@ -781,6 +786,11 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 


    private void handleFingerprintAuthenticated(int authUserId, boolean isStrongBiometric) {

        Trace.beginSection("KeyGuardUpdateMonitor#handlerFingerPrintAuthenticated");

        if (mHandler.hasCallbacks(mFpCancelNotReceived)) {

            Log.d(TAG, "handleFingerprintAuthenticated()"

                    + " triggered while waiting for cancellation, removing watchdog");

            mHandler.removeCallbacks(mFpCancelNotReceived);

        }

        try {

            final int userId;

            try {