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

Commit 365df3bd authored by Kevin Chyn's avatar Kevin Chyn Committed by Automerger Merge Worker
Browse files

[BugFix][Fingerprint]fix client was canceled by service by mistake am: 16aa67ef 

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

Change-Id: I1228bf95900a21273664485f24171250e59929a8
parents e2995751 16aa67ef

services/core/java/com/android/server/biometrics/AuthenticationClient.java

+3 −0
Original line number Diff line number Diff line
@@ -221,6 +221,9 @@ public abstract class AuthenticationClient extends ClientMonitor { 
                    }

                }

                result = lockoutMode != LOCKOUT_NONE; // in a lockout mode

                if(result) { // locked out

                    mAlreadyDone = true;

                }

            }

        } catch (RemoteException e) {

            Slog.e(getLogTag(), "Remote exception", e);

services/core/java/com/android/server/biometrics/ClientMonitor.java

+4 −0
Original line number Diff line number Diff line
@@ -237,6 +237,10 @@ public abstract class ClientMonitor extends LoggableMonitor implements IBinder.D 
    }



    void binderDiedInternal(boolean clearListener) {

        if (isAlreadyDone()) {

            Slog.w(getLogTag(), "Binder died but client is finished, ignoring");

            return;

        }

        // If the current client dies we should cancel the current operation.

        Slog.e(getLogTag(), "Binder died, cancelling client");

        stop(false /* initiatedByClient */);