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

Commit 80b1c60f authored by Grace Cheng's avatar Grace Cheng Committed by Automerger Merge Worker
Browse files

Merge "Configures FingerprintService to use FingerprintStateCallback to notify... 

Merge "Configures FingerprintService to use FingerprintStateCallback to notify clients of fingerprint sensor state changes" into sc-dev am: 42edcfbd

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

Change-Id: I49684dcb53d68017d2998ffcb8730d0326f931a6
parents 90aaa398 42edcfbd

core/java/android/hardware/fingerprint/FingerprintManager.java

+24 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static android.Manifest.permission.TEST_BIOMETRIC; 
import static android.Manifest.permission.USE_BIOMETRIC;

import static android.Manifest.permission.USE_BIOMETRIC_INTERNAL;

import static android.Manifest.permission.USE_FINGERPRINT;

import static android.hardware.fingerprint.FingerprintSensorProperties.TYPE_POWER_BUTTON;



import static com.android.internal.util.FrameworkStatsLog.AUTH_DEPRECATED_APIUSED__DEPRECATED_API__API_FINGERPRINT_MANAGER_AUTHENTICATE;

import static com.android.internal.util.FrameworkStatsLog.AUTH_DEPRECATED_APIUSED__DEPRECATED_API__API_FINGERPRINT_MANAGER_HAS_ENROLLED_FINGERPRINTS;
@@ -877,6 +878,19 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing 
        }

    }



    /**

     * Forwards FingerprintStateListener to FingerprintService

     * @param listener new FingerprintStateListener being added

     * @hide

     */

    public void registerFingerprintStateListener(@NonNull FingerprintStateListener listener) {

        try {

            mService.registerFingerprintStateListener(listener);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * @hide

     */
@@ -988,6 +1002,16 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing 
        }

    }



    /**

     * Returns whether the device has a power button fingerprint sensor.

     * @return boolean indicating whether power button is fingerprint sensor

     * @hide

     */

    public boolean isPowerbuttonFps() {

        final FingerprintSensorPropertiesInternal sensorProps = getFirstFingerprintSensor();

        return sensorProps.sensorType == TYPE_POWER_BUTTON;

    }



    /**

     * @hide

     */

core/java/android/hardware/fingerprint/IFingerprintService.aidl

+1 −1
Original line number Diff line number Diff line
@@ -156,6 +156,6 @@ interface IFingerprintService { 
    // Sets the controller for managing the UDFPS overlay.

    void setUdfpsOverlayController(in IUdfpsOverlayController controller);



    // Registers FingerprintStateListener in list stored by FingerprintService

    // Registers FingerprintStateListener in list stored by FingerprintService.

    void registerFingerprintStateListener(IFingerprintStateListener listener);

}

core/java/android/hardware/fingerprint/IFingerprintStateListener.aidl

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2014 The Android Open Source Project

 * Copyright (C) 2021 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ import android.hardware.fingerprint.Fingerprint; 


/**

 * Communication channel for FingerprintManager to register the FingerprintStateListener

 * in FingerprintService

 * in FingerprintService.

 * @hide

 */

oneway interface IFingerprintStateListener {

services/core/java/com/android/server/biometrics/sensors/BiometricScheduler.java

+1 −1
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ public class BiometricScheduler { 
     * Adds a {@link BaseClientMonitor} to the pending queue

     *

     * @param clientMonitor        operation to be scheduled

     * @param clientCallback optional callback, invoked when the client state changes

     * @param clientCallback optional callback, invoked when the client state changes.

     */

    public void scheduleClientMonitor(@NonNull BaseClientMonitor clientMonitor,

            @Nullable BaseClientMonitor.Callback clientCallback) {

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

+4 −60
Original line number Diff line number Diff line
@@ -29,11 +29,6 @@ import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPR 
import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ERROR_USER_CANCELED;

import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ERROR_VENDOR;

import static android.hardware.biometrics.SensorProperties.STRENGTH_STRONG;

import static android.hardware.fingerprint.FingerprintStateListener.STATE_AUTH_OTHER;

import static android.hardware.fingerprint.FingerprintStateListener.STATE_BP_AUTH;

import static android.hardware.fingerprint.FingerprintStateListener.STATE_ENROLLING;

import static android.hardware.fingerprint.FingerprintStateListener.STATE_IDLE;

import static android.hardware.fingerprint.FingerprintStateListener.STATE_KEYGUARD_AUTH;



import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -55,7 +50,6 @@ import android.hardware.fingerprint.Fingerprint; 
import android.hardware.fingerprint.FingerprintManager;

import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;

import android.hardware.fingerprint.FingerprintServiceReceiver;

import android.hardware.fingerprint.FingerprintStateListener;

import android.hardware.fingerprint.IFingerprintClientActiveCallback;

import android.hardware.fingerprint.IFingerprintService;

import android.hardware.fingerprint.IFingerprintServiceReceiver;
@@ -82,8 +76,6 @@ import com.android.internal.widget.LockPatternUtils; 
import com.android.server.ServiceThread;

import com.android.server.SystemService;

import com.android.server.biometrics.Utils;

import com.android.server.biometrics.sensors.AuthenticationClient;

import com.android.server.biometrics.sensors.BaseClientMonitor;

import com.android.server.biometrics.sensors.BiometricServiceCallback;

import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;

import com.android.server.biometrics.sensors.LockoutResetDispatcher;
@@ -91,7 +83,6 @@ import com.android.server.biometrics.sensors.LockoutTracker; 
import com.android.server.biometrics.sensors.fingerprint.aidl.FingerprintProvider;

import com.android.server.biometrics.sensors.fingerprint.hidl.Fingerprint21;

import com.android.server.biometrics.sensors.fingerprint.hidl.Fingerprint21UdfpsMock;

import com.android.server.biometrics.sensors.fingerprint.hidl.FingerprintEnrollClient;



import java.io.FileDescriptor;

import java.io.PrintWriter;
@@ -116,60 +107,13 @@ public class FingerprintService extends SystemService implements BiometricServic 
    private final FingerprintServiceWrapper mServiceWrapper;

    @NonNull private List<ServiceProvider> mServiceProviders;

    @NonNull private final FingerprintStateCallback mFingerprintStateCallback;

    @NonNull private @FingerprintStateListener.State int mFingerprintState;



    private List<IFingerprintStateListener> mFingerprintStateListeners = new ArrayList<>();



    /** Callback to receive notifications about changes in fingerprint state. */

    public final class FingerprintStateCallback implements BaseClientMonitor.Callback {

        @Override

        public void onClientStarted(@NonNull BaseClientMonitor client) {

            final int previousFingerprintState = mFingerprintState;

            if (client instanceof AuthenticationClient) {

                AuthenticationClient authClient = (AuthenticationClient) client;

                if (authClient.isKeyguard()) {

                    mFingerprintState = STATE_KEYGUARD_AUTH;

                } else if (authClient.isBiometricPrompt()) {

                    mFingerprintState = STATE_BP_AUTH;

                } else {

                    mFingerprintState = STATE_AUTH_OTHER;

                }

            } else if (client instanceof FingerprintEnrollClient) {

                mFingerprintState = STATE_ENROLLING;

            } else {

                Slog.w(TAG, "Other authentication client: " + Utils.getClientName(client));

                mFingerprintState = STATE_IDLE;

            }

            Slog.d(TAG, "Fps state updated from " + previousFingerprintState + " to "

                    + mFingerprintState + ", client " + client);

            notifyFingerprintStateListeners(mFingerprintState);

        }



        @Override

        public void onClientFinished(@NonNull BaseClientMonitor client, boolean success) {

            mFingerprintState = STATE_IDLE;

            Slog.d(TAG, "Client finished, fps state updated to " + mFingerprintState

                    + ", client " + client);

            notifyFingerprintStateListeners(mFingerprintState);

        }



        private void notifyFingerprintStateListeners(@FingerprintStateListener.State int newState) {

            for (IFingerprintStateListener listener : mFingerprintStateListeners) {

                try {

                    listener.onStateChanged(newState);

                } catch (RemoteException e) {

                    Slog.e(TAG, "Remote exception in fingerprint state change", e);

                }

            }

        }

    }



    /**

     * Registers FingerprintStateListener in list stored by FingerprintService

     * @param listener new FingerprintStateListener being added

     */

    public void registerFingerprintStateListener(IFingerprintStateListener listener) {

        mFingerprintStateListeners.add(listener);

    public void registerFingerprintStateListener(@NonNull IFingerprintStateListener listener) {

        mFingerprintStateCallback.registerFingerprintStateListener(listener);

    }



    /**
@@ -636,7 +580,8 @@ public class FingerprintService extends SystemService implements BiometricServic 
                                : provider.getSensorProperties()) {

                            pw.println("Dumping for sensorId: " + props.sensorId

                                    + ", provider: " + provider.getClass().getSimpleName());

                            pw.println("Fps state: " + mFingerprintState);

                            pw.println("Fps state: "

                                    + mFingerprintStateCallback.getFingerprintState());

                            provider.dumpInternal(props.sensorId, pw);

                            pw.println();

                        }
@@ -898,7 +843,6 @@ public class FingerprintService extends SystemService implements BiometricServic 
        mLockPatternUtils = new LockPatternUtils(context);

        mServiceProviders = new ArrayList<>();

        mFingerprintStateCallback = new FingerprintStateCallback();

        mFingerprintState = STATE_IDLE;

    }



    @Override