diff --git a/services/core/java/com/android/server/biometrics/sensors/BaseClientMonitor.java b/services/core/java/com/android/server/biometrics/sensors/BaseClientMonitor.java index 3cfaaf7c23e0d..677ea5dc8f034 100644 --- a/services/core/java/com/android/server/biometrics/sensors/BaseClientMonitor.java +++ b/services/core/java/com/android/server/biometrics/sensors/BaseClientMonitor.java @@ -52,7 +52,8 @@ public abstract class BaseClientMonitor extends LoggableMonitor * * @param clientMonitor Reference of the ClientMonitor that is starting. */ - default void onClientStarted(@NonNull BaseClientMonitor clientMonitor) {} + default void onClientStarted(@NonNull BaseClientMonitor clientMonitor) { + } /** * Invoked when the ClientMonitor operation is complete. This abstracts away asynchronous @@ -63,10 +64,11 @@ public abstract class BaseClientMonitor extends LoggableMonitor * @param clientMonitor Reference of the ClientMonitor that finished. * @param success True if the operation completed successfully. */ - default void onClientFinished(@NonNull BaseClientMonitor clientMonitor, boolean success) {} + default void onClientFinished(@NonNull BaseClientMonitor clientMonitor, boolean success) { + } } - protected final int mSequentialId; + private final int mSequentialId; @NonNull private final Context mContext; private final int mTargetUserId; @NonNull private final String mOwner; diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClient.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClient.java index 07d173c8da02e..0c883b047fe40 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClient.java @@ -92,7 +92,7 @@ class FaceAuthenticationClient extends AuthenticationClient implements @Override protected void startHalOperation() { try { - mCancellationSignal = getFreshDaemon().authenticate(mSequentialId, mOperationId); + mCancellationSignal = getFreshDaemon().authenticate(mOperationId); } catch (RemoteException e) { Slog.e(TAG, "Remote exception when requesting auth", e); onError(BiometricFaceConstants.FACE_ERROR_HW_UNAVAILABLE, 0 /* vendorCode */); diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceEnrollClient.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceEnrollClient.java index 0eb51fdba1591..58eb3ba9e7220 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceEnrollClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceEnrollClient.java @@ -160,7 +160,7 @@ public class FaceEnrollClient extends EnrollClient { features = new byte[0]; } - mCancellationSignal = getFreshDaemon().enroll(mSequentialId, + mCancellationSignal = getFreshDaemon().enroll( HardwareAuthTokenUtils.toHardwareAuthToken(mHardwareAuthToken), EnrollmentType.DEFAULT, features, mPreviewSurface); } catch (RemoteException e) { diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceGenerateChallengeClient.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceGenerateChallengeClient.java index 7a846f5b14a51..8cbb896f80a2e 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceGenerateChallengeClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceGenerateChallengeClient.java @@ -42,7 +42,7 @@ public class FaceGenerateChallengeClient extends GenerateChallengeClient { @Override protected void startHalOperation() { try { - getFreshDaemon().getAuthenticatorId(mSequentialId); + getFreshDaemon().getAuthenticatorId(); } catch (RemoteException e) { Slog.e(TAG, "Remote exception", e); } diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceInternalEnumerateClient.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceInternalEnumerateClient.java index 75888a5f28c94..0ece884ecff81 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceInternalEnumerateClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceInternalEnumerateClient.java @@ -48,7 +48,7 @@ class FaceInternalEnumerateClient extends InternalEnumerateClient { @Override protected void startHalOperation() { try { - getFreshDaemon().enumerateEnrollments(mSequentialId); + getFreshDaemon().enumerateEnrollments(); } catch (RemoteException e) { Slog.e(TAG, "Remote exception when requesting enumerate", e); mCallback.onClientFinished(this, false /* success */); diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceInvalidationClient.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceInvalidationClient.java index 855ee1dbf52fe..405e2b23b3af0 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceInvalidationClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceInvalidationClient.java @@ -40,7 +40,7 @@ public class FaceInvalidationClient extends InvalidationClient { @Override protected void startHalOperation() { try { - getFreshDaemon().invalidateAuthenticatorId(mSequentialId); + getFreshDaemon().invalidateAuthenticatorId(); } catch (RemoteException e) { Slog.e(TAG, "Remote exception", e); mCallback.onClientFinished(this, false /* success */); diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceRemovalClient.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceRemovalClient.java index 48796c173dd8d..ba678f3b19ae1 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceRemovalClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceRemovalClient.java @@ -53,7 +53,7 @@ class FaceRemovalClient extends RemovalClient { @Override protected void startHalOperation() { try { - getFreshDaemon().removeEnrollments(mSequentialId, mBiometricIds); + getFreshDaemon().removeEnrollments(mBiometricIds); } catch (RemoteException e) { Slog.e(TAG, "Remote exception when requesting remove", e); mCallback.onClientFinished(this, false /* success */); diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceResetLockoutClient.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceResetLockoutClient.java index ce728bc7c3155..5e57950ccf6eb 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceResetLockoutClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceResetLockoutClient.java @@ -71,7 +71,7 @@ public class FaceResetLockoutClient extends HalClientMonitor { @Override protected void startHalOperation() { try { - getFreshDaemon().resetLockout(mSequentialId, mHardwareAuthToken); + getFreshDaemon().resetLockout(mHardwareAuthToken); } catch (RemoteException e) { Slog.e(TAG, "Unable to reset lockout", e); mCallback.onClientFinished(this, false /* success */); diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceRevokeChallengeClient.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceRevokeChallengeClient.java index 2863f9fc2959f..229417361ddbc 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceRevokeChallengeClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceRevokeChallengeClient.java @@ -45,7 +45,7 @@ public class FaceRevokeChallengeClient extends RevokeChallengeClient { @Override protected void startHalOperation() { try { - getFreshDaemon().revokeChallenge(mSequentialId, mChallenge); + getFreshDaemon().revokeChallenge(mChallenge); } catch (RemoteException e) { Slog.e(TAG, "Unable to revokeChallenge", e); } diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceStopUserClient.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceStopUserClient.java index 8d3853b96b4e5..06328e311b067 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceStopUserClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceStopUserClient.java @@ -44,7 +44,7 @@ public class FaceStopUserClient extends StopUserClient { @Override protected void startHalOperation() { try { - getFreshDaemon().close(mSequentialId); + getFreshDaemon().close(); } catch (RemoteException e) { Slog.e(TAG, "Remote exception", e); getCallback().onClientFinished(this, false /* success */); diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/Sensor.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/Sensor.java index 768f464517b97..ee367756dc04d 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/Sensor.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/Sensor.java @@ -137,11 +137,6 @@ public class Sensor { mCallback = callback; } - @Override - public void onStateChanged(int cookie, byte state) { - // TODO(b/162973174) - } - @Override public void onChallengeGenerated(long challenge) { mHandler.post(() -> { @@ -535,7 +530,7 @@ public class Sensor { if (mCurrentSession != null && mCurrentSession.mSession != null) { // TODO(181984005): This should be scheduled instead of directly invoked Slog.d(mTag, "Closing old session"); - mCurrentSession.mSession.close(888 /* cookie */); + mCurrentSession.mSession.close(); } } catch (RemoteException e) { Slog.e(mTag, "RemoteException", e); diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/TestHal.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/TestHal.java index 36327bb5c21a9..c63af7e4b60c5 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/TestHal.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/TestHal.java @@ -22,7 +22,6 @@ import android.hardware.biometrics.face.IFace; import android.hardware.biometrics.face.ISession; import android.hardware.biometrics.face.ISessionCallback; import android.hardware.biometrics.face.SensorProps; -import android.hardware.biometrics.face.SessionState; import android.hardware.common.NativeHandle; import android.hardware.keymaster.HardwareAuthToken; import android.os.RemoteException; @@ -45,21 +44,21 @@ public class TestHal extends IFace.Stub { return new ISession.Stub() { @Override - public void generateChallenge(int cookie) throws RemoteException { - Slog.w(TAG, "generateChallenge, cookie: " + cookie); + public void generateChallenge() throws RemoteException { + Slog.w(TAG, "generateChallenge"); cb.onChallengeGenerated(0L); } @Override - public void revokeChallenge(int cookie, long challenge) throws RemoteException { - Slog.w(TAG, "revokeChallenge: " + challenge + ", cookie: " + cookie); + public void revokeChallenge(long challenge) throws RemoteException { + Slog.w(TAG, "revokeChallenge: " + challenge); cb.onChallengeRevoked(challenge); } @Override - public ICancellationSignal enroll(int cookie, HardwareAuthToken hat, + public ICancellationSignal enroll(HardwareAuthToken hat, byte enrollmentType, byte[] features, NativeHandle previewSurface) { - Slog.w(TAG, "enroll, cookie: " + cookie); + Slog.w(TAG, "enroll"); return new ICancellationSignal.Stub() { @Override public void cancel() throws RemoteException { @@ -69,8 +68,8 @@ public class TestHal extends IFace.Stub { } @Override - public ICancellationSignal authenticate(int cookie, long operationId) { - Slog.w(TAG, "authenticate, cookie: " + cookie); + public ICancellationSignal authenticate(long operationId) { + Slog.w(TAG, "authenticate"); return new ICancellationSignal.Stub() { @Override public void cancel() throws RemoteException { @@ -80,8 +79,8 @@ public class TestHal extends IFace.Stub { } @Override - public ICancellationSignal detectInteraction(int cookie) { - Slog.w(TAG, "detectInteraction, cookie: " + cookie); + public ICancellationSignal detectInteraction() { + Slog.w(TAG, "detectInteraction"); return new ICancellationSignal.Stub() { @Override public void cancel() throws RemoteException { @@ -91,51 +90,51 @@ public class TestHal extends IFace.Stub { } @Override - public void enumerateEnrollments(int cookie) throws RemoteException { - Slog.w(TAG, "enumerateEnrollments, cookie: " + cookie); + public void enumerateEnrollments() throws RemoteException { + Slog.w(TAG, "enumerateEnrollments"); cb.onEnrollmentsEnumerated(new int[0]); } @Override - public void removeEnrollments(int cookie, int[] enrollmentIds) throws RemoteException { - Slog.w(TAG, "removeEnrollments, cookie: " + cookie); + public void removeEnrollments(int[] enrollmentIds) throws RemoteException { + Slog.w(TAG, "removeEnrollments"); cb.onEnrollmentsRemoved(enrollmentIds); } @Override - public void getFeatures(int cookie, int enrollmentId) throws RemoteException { - Slog.w(TAG, "getFeatures, cookie: " + cookie); + public void getFeatures(int enrollmentId) throws RemoteException { + Slog.w(TAG, "getFeatures"); cb.onFeaturesRetrieved(new byte[0], enrollmentId); } @Override - public void setFeature(int cookie, HardwareAuthToken hat, int enrollmentId, + public void setFeature(HardwareAuthToken hat, int enrollmentId, byte feature, boolean enabled) throws RemoteException { - Slog.w(TAG, "setFeature, cookie: " + cookie); + Slog.w(TAG, "setFeature"); cb.onFeatureSet(enrollmentId, feature); } @Override - public void getAuthenticatorId(int cookie) throws RemoteException { - Slog.w(TAG, "getAuthenticatorId, cookie: " + cookie); + public void getAuthenticatorId() throws RemoteException { + Slog.w(TAG, "getAuthenticatorId"); cb.onAuthenticatorIdRetrieved(0L); } @Override - public void invalidateAuthenticatorId(int cookie) throws RemoteException { - Slog.w(TAG, "invalidateAuthenticatorId, cookie: " + cookie); + public void invalidateAuthenticatorId() throws RemoteException { + Slog.w(TAG, "invalidateAuthenticatorId"); cb.onAuthenticatorIdInvalidated(0L); } @Override - public void resetLockout(int cookie, HardwareAuthToken hat) throws RemoteException { - Slog.w(TAG, "resetLockout, cookie: " + cookie); + public void resetLockout(HardwareAuthToken hat) throws RemoteException { + Slog.w(TAG, "resetLockout"); cb.onLockoutCleared(); } @Override - public void close(int cookie) throws RemoteException { - Slog.w(TAG, "close, cookie: " + cookie); + public void close() throws RemoteException { + Slog.w(TAG, "close"); cb.onSessionClosed(); } }; diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java index 76a47d382e4b4..4e5d12d2021ce 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java @@ -92,7 +92,7 @@ class FingerprintAuthenticationClient extends AuthenticationClient imp UdfpsHelper.showUdfpsOverlay(getSensorId(), Utils.getUdfpsAuthReason(this), mUdfpsOverlayController, this); try { - mCancellationSignal = getFreshDaemon().authenticate(mSequentialId, mOperationId); + mCancellationSignal = getFreshDaemon().authenticate(mOperationId); } catch (RemoteException e) { Slog.e(TAG, "Remote exception", e); onError(BiometricFingerprintConstants.FINGERPRINT_ERROR_HW_UNAVAILABLE, diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintDetectClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintDetectClient.java index 620a9cf3e6f24..9e9d0eec74abb 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintDetectClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintDetectClient.java @@ -74,7 +74,7 @@ class FingerprintDetectClient extends AcquisitionClient { IUdfpsOverlayController.REASON_AUTH_FPM_KEYGUARD, mUdfpsOverlayController, this); try { - mCancellationSignal = getFreshDaemon().detectInteraction(mSequentialId); + mCancellationSignal = getFreshDaemon().detectInteraction(); } catch (RemoteException e) { Slog.e(TAG, "Remote exception when requesting finger detect", e); UdfpsHelper.hideUdfpsOverlay(getSensorId(), mUdfpsOverlayController); diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintEnrollClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintEnrollClient.java index 63fa66cdca209..fd4aece339f33 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintEnrollClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintEnrollClient.java @@ -123,7 +123,7 @@ class FingerprintEnrollClient extends EnrollClient implements Udfps { UdfpsHelper.getReasonFromEnrollReason(mEnrollReason), mUdfpsOverlayController, this); try { - mCancellationSignal = getFreshDaemon().enroll(mSequentialId, + mCancellationSignal = getFreshDaemon().enroll( HardwareAuthTokenUtils.toHardwareAuthToken(mHardwareAuthToken)); } catch (RemoteException e) { Slog.e(TAG, "Remote exception when requesting enroll", e); diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintGenerateChallengeClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintGenerateChallengeClient.java index 3c9cceddb5fd6..83c64210d6f68 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintGenerateChallengeClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintGenerateChallengeClient.java @@ -44,7 +44,7 @@ class FingerprintGenerateChallengeClient extends GenerateChallengeClient { @Override protected void startHalOperation() { try { - getFreshDaemon().getAuthenticatorId(mSequentialId); + getFreshDaemon().getAuthenticatorId(); } catch (RemoteException e) { Slog.e(TAG, "Remote exception", e); } diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintInternalEnumerateClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintInternalEnumerateClient.java index c9303609c8dcc..e20544a86d010 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintInternalEnumerateClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintInternalEnumerateClient.java @@ -48,7 +48,7 @@ class FingerprintInternalEnumerateClient extends InternalEnumerateClient { @Override protected void startHalOperation() { try { - getFreshDaemon().removeEnrollments(mSequentialId, mBiometricIds); + getFreshDaemon().removeEnrollments(mBiometricIds); } catch (RemoteException e) { Slog.e(TAG, "Remote exception when requesting remove", e); mCallback.onClientFinished(this, false /* success */); diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintResetLockoutClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintResetLockoutClient.java index adffba280c7f3..b00c592e83ff8 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintResetLockoutClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintResetLockoutClient.java @@ -71,7 +71,7 @@ class FingerprintResetLockoutClient extends HalClientMonitor { @Override protected void startHalOperation() { try { - getFreshDaemon().resetLockout(mSequentialId, mHardwareAuthToken); + getFreshDaemon().resetLockout(mHardwareAuthToken); } catch (RemoteException e) { Slog.e(TAG, "Unable to reset lockout", e); mCallback.onClientFinished(this, false /* success */); diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintRevokeChallengeClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintRevokeChallengeClient.java index ebb4fe63e4a1c..d9bf1c3aa3039 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintRevokeChallengeClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintRevokeChallengeClient.java @@ -45,7 +45,7 @@ class FingerprintRevokeChallengeClient extends RevokeChallengeClient { @Override protected void startHalOperation() { try { - getFreshDaemon().revokeChallenge(mSequentialId, mChallenge); + getFreshDaemon().revokeChallenge(mChallenge); } catch (RemoteException e) { Slog.e(TAG, "Unable to revokeChallenge", e); } diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintStopUserClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintStopUserClient.java index ba813578245c8..7055d653dd160 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintStopUserClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintStopUserClient.java @@ -44,7 +44,7 @@ public class FingerprintStopUserClient extends StopUserClient { @Override protected void startHalOperation() { try { - getFreshDaemon().close(mSequentialId); + getFreshDaemon().close(); } catch (RemoteException e) { Slog.e(TAG, "Remote exception", e); getCallback().onClientFinished(this, false /* success */); diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/Sensor.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/Sensor.java index cd12d02ceef29..4862d849613d9 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/Sensor.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/Sensor.java @@ -135,11 +135,6 @@ class Sensor { mCallback = callback; } - @Override - public void onStateChanged(int cookie, byte state) { - // TODO(b/162973174) - } - @Override public void onChallengeGenerated(long challenge) { mHandler.post(() -> { @@ -515,7 +510,7 @@ class Sensor { if (mCurrentSession != null && mCurrentSession.mSession != null) { // TODO(181984005): This should be scheduled instead of directly invoked Slog.d(mTag, "Closing old session"); - mCurrentSession.mSession.close(999 /* cookie */); + mCurrentSession.mSession.close(); } } catch (RemoteException e) { Slog.e(mTag, "RemoteException", e); diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/TestHal.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/TestHal.java index 31fc06818b905..abc3597a5183b 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/TestHal.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/TestHal.java @@ -22,7 +22,6 @@ import android.hardware.biometrics.fingerprint.IFingerprint; import android.hardware.biometrics.fingerprint.ISession; import android.hardware.biometrics.fingerprint.ISessionCallback; import android.hardware.biometrics.fingerprint.SensorProps; -import android.hardware.biometrics.fingerprint.SessionState; import android.hardware.keymaster.HardwareAuthToken; import android.os.RemoteException; import android.util.Slog; @@ -45,20 +44,20 @@ public class TestHal extends IFingerprint.Stub { return new ISession.Stub() { @Override - public void generateChallenge(int cookie) throws RemoteException { - Slog.w(TAG, "generateChallenge, cookie: " + cookie); + public void generateChallenge() throws RemoteException { + Slog.w(TAG, "generateChallenge"); cb.onChallengeGenerated(0L); } @Override - public void revokeChallenge(int cookie, long challenge) throws RemoteException { - Slog.w(TAG, "revokeChallenge: " + challenge + ", cookie: " + cookie); + public void revokeChallenge(long challenge) throws RemoteException { + Slog.w(TAG, "revokeChallenge: " + challenge); cb.onChallengeRevoked(challenge); } @Override - public ICancellationSignal enroll(int cookie, HardwareAuthToken hat) { - Slog.w(TAG, "enroll, cookie: " + cookie); + public ICancellationSignal enroll(HardwareAuthToken hat) { + Slog.w(TAG, "enroll"); return new ICancellationSignal.Stub() { @Override public void cancel() throws RemoteException { @@ -68,8 +67,8 @@ public class TestHal extends IFingerprint.Stub { } @Override - public ICancellationSignal authenticate(int cookie, long operationId) { - Slog.w(TAG, "authenticate, cookie: " + cookie); + public ICancellationSignal authenticate(long operationId) { + Slog.w(TAG, "authenticate"); return new ICancellationSignal.Stub() { @Override public void cancel() throws RemoteException { @@ -79,8 +78,8 @@ public class TestHal extends IFingerprint.Stub { } @Override - public ICancellationSignal detectInteraction(int cookie) { - Slog.w(TAG, "detectInteraction, cookie: " + cookie); + public ICancellationSignal detectInteraction() { + Slog.w(TAG, "detectInteraction"); return new ICancellationSignal.Stub() { @Override public void cancel() throws RemoteException { @@ -90,38 +89,38 @@ public class TestHal extends IFingerprint.Stub { } @Override - public void enumerateEnrollments(int cookie) throws RemoteException { - Slog.w(TAG, "enumerateEnrollments, cookie: " + cookie); + public void enumerateEnrollments() throws RemoteException { + Slog.w(TAG, "enumerateEnrollments"); cb.onEnrollmentsEnumerated(new int[0]); } @Override - public void removeEnrollments(int cookie, int[] enrollmentIds) throws RemoteException { - Slog.w(TAG, "removeEnrollments, cookie: " + cookie); + public void removeEnrollments(int[] enrollmentIds) throws RemoteException { + Slog.w(TAG, "removeEnrollments"); cb.onEnrollmentsRemoved(enrollmentIds); } @Override - public void getAuthenticatorId(int cookie) throws RemoteException { - Slog.w(TAG, "getAuthenticatorId, cookie: " + cookie); + public void getAuthenticatorId() throws RemoteException { + Slog.w(TAG, "getAuthenticatorId"); cb.onAuthenticatorIdRetrieved(0L); } @Override - public void invalidateAuthenticatorId(int cookie) throws RemoteException { - Slog.w(TAG, "invalidateAuthenticatorId, cookie: " + cookie); + public void invalidateAuthenticatorId() throws RemoteException { + Slog.w(TAG, "invalidateAuthenticatorId"); cb.onAuthenticatorIdInvalidated(0L); } @Override - public void resetLockout(int cookie, HardwareAuthToken hat) throws RemoteException { - Slog.w(TAG, "resetLockout, cookie: " + cookie); + public void resetLockout(HardwareAuthToken hat) throws RemoteException { + Slog.w(TAG, "resetLockout"); cb.onLockoutCleared(); } @Override - public void close(int cookie) throws RemoteException { - Slog.w(TAG, "close, cookie: " + cookie); + public void close() throws RemoteException { + Slog.w(TAG, "close"); cb.onSessionClosed(); }