Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix AIDL FingerprintEnrollClient not being recognized as an EnrollClient" into sc-v2-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-10-29 03:39:53 +00:00
committed by Android (Google) Code Review
parent 6665ad79a3 86efc2ef6b
commit c30b714fc6
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,6 @@ import static android.hardware.fingerprint.FingerprintStateListener.STATE_IDLE;
import static android.hardware.fingerprint.FingerprintStateListener.STATE_KEYGUARD_AUTH; import static android.hardware.fingerprint.FingerprintStateListener.STATE_KEYGUARD_AUTH;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.content.Context;
import android.hardware.fingerprint.FingerprintStateListener; import android.hardware.fingerprint.FingerprintStateListener;
import android.hardware.fingerprint.IFingerprintStateListener; import android.hardware.fingerprint.IFingerprintStateListener;
import android.os.RemoteException; 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.BaseClientMonitor;
import com.android.server.biometrics.sensors.EnrollClient; import com.android.server.biometrics.sensors.EnrollClient;
import com.android.server.biometrics.sensors.EnrollmentModifier; 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; import java.util.concurrent.CopyOnWriteArrayList;
@@ -70,7 +67,7 @@ public class FingerprintStateCallback implements BaseClientMonitor.Callback {
} else { } else {
mFingerprintState = STATE_AUTH_OTHER; mFingerprintState = STATE_AUTH_OTHER;
} }
} else if (client instanceof FingerprintEnrollClient) { } else if (client instanceof EnrollClient) {
mFingerprintState = STATE_ENROLLING; mFingerprintState = STATE_ENROLLING;
} else { } else {
Slog.w(FingerprintService.TAG, 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 * Enables clients to register a FingerprintStateListener. Used by FingerprintService to forward
* updates in fingerprint sensor state to the SideFpNsEventHandler * updates in fingerprint sensor state to the SideFpNsEventHandler
*
* @param listener * @param listener
*/ */
public void registerFingerprintStateListener(@NonNull IFingerprintStateListener listener) { public void registerFingerprintStateListener(@NonNull IFingerprintStateListener listener) {