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

Commit 86efc2ef authored by Ilya Matyukhin's avatar Ilya Matyukhin
Browse files

Fix AIDL FingerprintEnrollClient not being recognized as an EnrollClient 

Bug: 204475631
Test: atest FingerprintStateCallbackTest
Test: no "Other authentication client" logs during AIDL enrollment
Change-Id: If3b29bf1e4d458d97ee1472f8e5134ed576aca95
parent 1679d92e

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

+2 −4
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import static android.hardware.fingerprint.FingerprintStateListener.STATE_IDLE; 
import static android.hardware.fingerprint.FingerprintStateListener.STATE_KEYGUARD_AUTH;



import android.annotation.NonNull;

import android.content.Context;

import android.hardware.fingerprint.FingerprintStateListener;

import android.hardware.fingerprint.IFingerprintStateListener;

import android.os.RemoteException;
@@ -34,8 +33,6 @@ import com.android.server.biometrics.sensors.AuthenticationClient; 
import com.android.server.biometrics.sensors.BaseClientMonitor;

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

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

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

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



import java.util.concurrent.CopyOnWriteArrayList;
@@ -70,7 +67,7 @@ public class FingerprintStateCallback implements BaseClientMonitor.Callback { 
            } else {

                mFingerprintState = STATE_AUTH_OTHER;

            }

        } else if (client instanceof FingerprintEnrollClient) {

        } else if (client instanceof EnrollClient) {

            mFingerprintState = STATE_ENROLLING;

        } else {

            Slog.w(FingerprintService.TAG,
@@ -143,6 +140,7 @@ public class FingerprintStateCallback implements BaseClientMonitor.Callback { 
    /**

     * Enables clients to register a FingerprintStateListener. Used by FingerprintService to forward

     * updates in fingerprint sensor state to the SideFpNsEventHandler

     *

     * @param listener

     */

    public void registerFingerprintStateListener(@NonNull IFingerprintStateListener listener) {