Remove sensorId, userId from onChallenge*
These methods were moved into ISession, but forgot to remove the
sensorId, userId parameters
Bug: 173453845
Test: m android.hardware.biometrics.face-update-api
Test: m android.hardware.biometrics.face-service.example
Test: m VtsHalBiometricsFaceTargetTest
Change-Id: I78efd095e0b86f8a8568c8d74d946fd8436f6e65
diff --git a/biometrics/face/aidl/aidl_api/android.hardware.biometrics.face/current/android/hardware/biometrics/face/ISessionCallback.aidl b/biometrics/face/aidl/aidl_api/android.hardware.biometrics.face/current/android/hardware/biometrics/face/ISessionCallback.aidl
index 477ba5a..caf65ae 100644
--- a/biometrics/face/aidl/aidl_api/android.hardware.biometrics.face/current/android/hardware/biometrics/face/ISessionCallback.aidl
+++ b/biometrics/face/aidl/aidl_api/android.hardware.biometrics.face/current/android/hardware/biometrics/face/ISessionCallback.aidl
@@ -19,8 +19,8 @@
@VintfStability
interface ISessionCallback {
void onStateChanged(in int cookie, in android.hardware.biometrics.face.SessionState state);
- void onChallengeGenerated(in int sensorId, in int userId, in long challenge);
- void onChallengeRevoked(in int sensorId, in int userId, in long challenge);
+ void onChallengeGenerated(in long challenge);
+ void onChallengeRevoked(in long challenge);
void onAcquired(in android.hardware.biometrics.face.AcquiredInfo info, in int vendorCode);
void onError(in android.hardware.biometrics.face.Error error, in int vendorCode);
void onEnrollmentProgress(in int enrollmentId, int remaining);
diff --git a/biometrics/face/aidl/android/hardware/biometrics/face/ISessionCallback.aidl b/biometrics/face/aidl/android/hardware/biometrics/face/ISessionCallback.aidl
index 2608d5f..fd4a648 100644
--- a/biometrics/face/aidl/android/hardware/biometrics/face/ISessionCallback.aidl
+++ b/biometrics/face/aidl/android/hardware/biometrics/face/ISessionCallback.aidl
@@ -31,12 +31,12 @@
/**
* Notifies the framework when a challenge is successfully generated.
*/
- void onChallengeGenerated(in int sensorId, in int userId, in long challenge);
+ void onChallengeGenerated(in long challenge);
/**
* Notifies the framework when a challenge has been revoked.
*/
- void onChallengeRevoked(in int sensorId, in int userId, in long challenge);
+ void onChallengeRevoked(in long challenge);
/**
* This method must only be used to notify the framework during the following states:
diff --git a/biometrics/face/aidl/vts/VtsHalBiometricsFaceTargetTest.cpp b/biometrics/face/aidl/vts/VtsHalBiometricsFaceTargetTest.cpp
index c1ba66b..5f10306 100644
--- a/biometrics/face/aidl/vts/VtsHalBiometricsFaceTargetTest.cpp
+++ b/biometrics/face/aidl/vts/VtsHalBiometricsFaceTargetTest.cpp
@@ -51,13 +51,11 @@
return ndk::ScopedAStatus::ok();
}
- ndk::ScopedAStatus onChallengeGenerated(int32_t /*sensorId*/, int32_t /*userId*/,
- int64_t /*challenge*/) override {
+ ndk::ScopedAStatus onChallengeGenerated(int64_t /*challenge*/) override {
return ndk::ScopedAStatus::ok();
}
- ndk::ScopedAStatus onChallengeRevoked(int32_t /*sensorId*/, int32_t /*userId*/,
- int64_t /*challenge*/) override {
+ ndk::ScopedAStatus onChallengeRevoked(int64_t /*challenge*/) override {
return ndk::ScopedAStatus::ok();
}