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

Commit 72eda1bb authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "[BugFix][Fingerprint]fix client was canceled by service by mistake"

parents bd03ae8b ed1c9cae

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

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

                    }

                }

                }

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

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

                if(result) { // lockde out

                    mAlreadyDone = true;

                }

            }

            }

        } catch (RemoteException e) {

        } catch (RemoteException e) {

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

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

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -945,6 +945,7 @@ public abstract class BiometricServiceBase extends SystemService 
            if (!client.onError(getHalDeviceId(), errorCode, 0 /* vendorCode */)) {

            if (!client.onError(getHalDeviceId(), errorCode, 0 /* vendorCode */)) {

                Slog.w(getTag(), "Cannot send permanent lockout message to client");

                Slog.w(getTag(), "Cannot send permanent lockout message to client");

            }

            }



            return;

            return;

        }

        }

        startClient(client, true /* initiatedByClient */);

        startClient(client, true /* initiatedByClient */);

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

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




    @Override

    @Override

    public void binderDied() {

    public void binderDied() {

        if (isAlreadyDone()) {

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

            return;

        }

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

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

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

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

        stop(false /* initiatedByClient */);

        stop(false /* initiatedByClient */);