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

Commit d0b8b1fd authored by Kevin Chyn's avatar Kevin Chyn
Browse files

Add logging for when cancel times out 

Fixes: 124513621

Test: Builds
Change-Id: Idf8f8eaeaf6847dedc8b850798c98cb250fdc8ac
parent 17c63bab

core/proto/android/hardware/biometrics/enums.proto

+2 −0
Original line number Diff line number Diff line
@@ -55,4 +55,6 @@ enum IssueEnum { 
    // When the HAL has a template that doesn't exist in Android Framework. The framework

    // is expected to notify the HAL to remove this template to stay in sync with the framework.

    ISSUE_UNKNOWN_TEMPLATE_ENROLLED_HAL = 3;

    // When the HAL has not sent ERROR_CANCELED within the specified timeout.

    ISSUE_CANCEL_TIMED_OUT = 4;

}
 
 No newline at end of file

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

+4 −0
Original line number Diff line number Diff line
@@ -542,6 +542,9 @@ public abstract class BiometricServiceBase extends SystemService 
                    + " failed to respond to cancel, starting client "

                    + (mPendingClient != null ? mPendingClient.getOwnerString() : "null"));



            StatsLog.write(StatsLog.BIOMETRIC_SYSTEM_HEALTH_ISSUE_DETECTED,

                    statsModality(), BiometricsProtoEnums.ISSUE_CANCEL_TIMED_OUT);



            mCurrentClient = null;

            startClient(mPendingClient, false);

        }
@@ -817,6 +820,7 @@ public abstract class BiometricServiceBase extends SystemService 
        mHandler.post(() -> {

            ClientMonitor client = mCurrentClient;

            if (client instanceof EnrollClient && client.getToken() == token) {

                if (DEBUG) Slog.v(getTag(), "Cancelling enrollment");

                client.stop(client.getToken() == token);

            }

        });