Merge "Updated Fingerprint enrollment logging"

     * @param cancel an object that can be used to cancel enrollment

     * @param userId the user to whom this fingerprint will belong to

     * @param callback an object to receive enrollment events

     * @param shouldLogMetrics a flag that indicates if enrollment failure/success metrics

     * should be logged.

     * @hide

     */

    @RequiresPermission(MANAGE_FINGERPRINT)

    public void enroll(byte [] hardwareAuthToken, CancellationSignal cancel, int userId,

            EnrollmentCallback callback) {

            EnrollmentCallback callback, boolean shouldLogMetrics) {

        if (userId == UserHandle.USER_CURRENT) {

            userId = getCurrentUserId();

        }

            try {

                mEnrollmentCallback = callback;

                mService.enroll(mToken, hardwareAuthToken, userId, mServiceReceiver,

                        mContext.getOpPackageName());

                        mContext.getOpPackageName(), shouldLogMetrics);

            } catch (RemoteException e) {

                Slog.w(TAG, "Remote exception in enroll: ", e);

                // Though this may not be a hardware issue, it will cause apps to give up or try

    // Start fingerprint enrollment

    void enroll(IBinder token, in byte [] hardwareAuthToken, int userId, IFingerprintServiceReceiver receiver,

            String opPackageName);

            String opPackageName, boolean shouldLogMetrics);

    // Cancel enrollment in progress

    void cancelEnrollment(IBinder token);

    public AcquisitionClient(@NonNull Context context, @NonNull LazyDaemon<T> lazyDaemon,

            @NonNull IBinder token, @NonNull ClientMonitorCallbackConverter listener, int userId,

            @NonNull String owner, int cookie, int sensorId, int statsModality,

            int statsAction, int statsClient) {

            int statsAction, int statsClient, boolean shouldLogMetrics) {

        super(context, lazyDaemon, token, listener, userId, owner, cookie, sensorId, statsModality,

                statsAction, statsClient);

                statsAction, statsClient, shouldLogMetrics);

        mPowerManager = context.getSystemService(PowerManager.class);

        mSuccessVibrationEffect = VibrationEffect.get(VibrationEffect.EFFECT_CLICK);

        mErrorVibrationEffect = VibrationEffect.get(VibrationEffect.EFFECT_DOUBLE_CLICK);

import android.annotation.Nullable;

import android.app.ActivityManager;

import android.app.ActivityTaskManager;

import android.app.IActivityTaskManager;

import android.app.TaskStackListener;

import android.content.ComponentName;

import android.content.Context;

            int statsModality, int statsClient, @Nullable TaskStackListener taskStackListener,

            @NonNull LockoutTracker lockoutTracker) {

        super(context, lazyDaemon, token, listener, targetUserId, owner, cookie, sensorId,

                statsModality, BiometricsProtoEnums.ACTION_AUTHENTICATE, statsClient);

                statsModality, BiometricsProtoEnums.ACTION_AUTHENTICATE, statsClient,

                true /* shouldLogMetrics */);

        mIsStrongBiometric = isStrongBiometric;

        mOperationId = operationId;

        mRequireConfirmation = requireConfirmation;

    public ClientMonitor(@NonNull Context context, @NonNull LazyDaemon<T> lazyDaemon,

            @Nullable IBinder token, @Nullable ClientMonitorCallbackConverter listener, int userId,

            @NonNull String owner, int cookie, int sensorId, int statsModality, int statsAction,

            int statsClient) {

        super(statsModality, statsAction, statsClient);

            int statsClient, boolean shouldLogMetrics) {

        super(statsModality, statsAction, statsClient, shouldLogMetrics);

        mSequentialId = sCount++;

        mContext = context;

        mLazyDaemon = lazyDaemon;