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

Commit bf79852a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add metrics logging for critical fingerprintd errors" into nyc-mr1-dev

parents bce10d35 c57c8d93

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

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ public abstract class AuthenticationClient extends ClientMonitor { 
            final int result = daemon.authenticate(mOpId, getGroupId());

            if (result != 0) {

                Slog.w(TAG, "startAuthentication failed, result=" + result);

                MetricsLogger.histogram(getContext(), "fingeprintd_auth_start_error", result);

                onError(FingerprintManager.FINGERPRINT_ERROR_HW_UNAVAILABLE);

                return result;

            }

services/core/java/com/android/server/fingerprint/EnrollClient.java

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ public abstract class EnrollClient extends ClientMonitor { 
            final int result = daemon.enroll(mCryptoToken, getGroupId(), timeout);

            if (result != 0) {

                Slog.w(TAG, "startEnroll failed, result=" + result);

                MetricsLogger.histogram(getContext(), "fingerprintd_enroll_start_error", result);

                onError(FingerprintManager.FINGERPRINT_ERROR_HW_UNAVAILABLE);

                return result;

            }

services/core/java/com/android/server/fingerprint/EnumerateClient.java

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.hardware.fingerprint.IFingerprintServiceReceiver; 
import android.os.IBinder;

import android.os.RemoteException;

import android.util.Slog;

import com.android.internal.logging.MetricsLogger;



/**

 * A class to keep track of the enumeration state for a given client.
@@ -43,6 +44,7 @@ public abstract class EnumerateClient extends ClientMonitor { 
            if (result != 0) {

                Slog.w(TAG, "start enumerate for user " + getTargetUserId()

                    + " failed, result=" + result);

                MetricsLogger.histogram(getContext(), "fingerprintd_enum_start_error", result);

                onError(FingerprintManager.FINGERPRINT_ERROR_HW_UNAVAILABLE);

                return result;

            }

services/core/java/com/android/server/fingerprint/FingerprintService.java

+2 −0
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe 
    @Override

    public void binderDied() {

        Slog.v(TAG, "fingerprintd died");

        MetricsLogger.count(mContext, "fingerprintd_died", 1);

        mDaemon = null;

        mCurrentUserId = UserHandle.USER_CURRENT;

        handleError(mHalDeviceId, FingerprintManager.FINGERPRINT_ERROR_HW_UNAVAILABLE);
@@ -211,6 +212,7 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe 
                        updateActiveGroup(ActivityManager.getCurrentUser(), null);

                    } else {

                        Slog.w(TAG, "Failed to open Fingerprint HAL!");

                        MetricsLogger.count(mContext, "fingerprintd_openhal_error", 1);

                        mDaemon = null;

                    }

                } catch (RemoteException e) {

services/core/java/com/android/server/fingerprint/RemovalClient.java

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.os.IBinder; 
import android.os.RemoteException;

import android.os.UserHandle;

import android.util.Slog;

import com.android.internal.logging.MetricsLogger;



/**

 * A class to keep track of the remove state for a given client.
@@ -46,6 +47,7 @@ public abstract class RemovalClient extends ClientMonitor { 
            final int result = daemon.remove(mFingerId, getGroupId());

            if (result != 0) {

                Slog.w(TAG, "startRemove with id = " + mFingerId + " failed, result=" + result);

                MetricsLogger.histogram(getContext(), "fingerprintd_remove_start_error", result);

                onError(FingerprintManager.FINGERPRINT_ERROR_HW_UNAVAILABLE);

                return result;

            }