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

Commit 5f73e94b authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Automerger Merge Worker
Browse files

Merge "Updated keyguard to be robust against fpm" into tm-d1-dev am: 2da48dba 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19347058



Change-Id: Ic627d03c89df6a4b088f614fc0ba1ab57db5bdb0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ccfb40a9 2da48dba

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 {