Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move ICancellationSignal to common, add supportsNavigationGestures

Browse Source 
Bug: 168842956
Test: Builds
Test: make -j56 android.hardware.biometrics.common-update-api
Test: make -j56 android.hardware.biometrics.fingerprint-update-api
Test: make -j56 VtsHalBiometricsFingerprintTargetTest

Change-Id: Ie35ccc2ea8b7ef710914e9a18fc28f49c2d6f0be
This commit is contained in:
Kevin Chyn
2020-09-18 10:31:50 -07:00
parent c306b76f7f
commit e33abd6456
11 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
biometrics/fingerprint/aidl/aidl_api/android.hardware.biometrics.fingerprint/current/android/hardware/biometrics/fingerprint/ICancellationSignal.aidl → biometrics/common/aidl/aidl_api/android.hardware.biometrics.common/current/android/hardware/biometrics/common/ICancellationSignal.aidl
View File

@@ -15,7 +15,7 @@
// with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.biometrics.fingerprint;
package android.hardware.biometrics.common;
@VintfStability
interface ICancellationSignal {
oneway void cancel();

2
biometrics/fingerprint/aidl/android/hardware/biometrics/fingerprint/ICancellationSignal.aidl → biometrics/common/aidl/android/hardware/biometrics/common/ICancellationSignal.aidl
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package android.hardware.biometrics.fingerprint;
package android.hardware.biometrics.common;
@VintfStability
oneway interface ICancellationSignal {

6
biometrics/fingerprint/aidl/aidl_api/android.hardware.biometrics.fingerprint/current/android/hardware/biometrics/fingerprint/ISession.aidl
View File

@@ -18,9 +18,9 @@
package android.hardware.biometrics.fingerprint;
@VintfStability
interface ISession {
android.hardware.biometrics.fingerprint.ICancellationSignal enroll(in int cookie, in android.hardware.keymaster.HardwareAuthToken hat);
android.hardware.biometrics.fingerprint.ICancellationSignal authenticate(in int cookie, in long keystoreOperationId);
android.hardware.biometrics.fingerprint.ICancellationSignal detectInteraction(in int cookie);
android.hardware.biometrics.common.ICancellationSignal enroll(in int cookie, in android.hardware.keymaster.HardwareAuthToken hat);
android.hardware.biometrics.common.ICancellationSignal authenticate(in int cookie, in long keystoreOperationId);
android.hardware.biometrics.common.ICancellationSignal detectInteraction(in int cookie);
void enumerateEnrollments(in int cookie);
void removeEnrollments(in int cookie, in int[] enrollmentIds);
void getAuthenticatorId(in int cookie);

1
biometrics/fingerprint/aidl/aidl_api/android.hardware.biometrics.fingerprint/current/android/hardware/biometrics/fingerprint/SensorProps.aidl
View File

@@ -20,6 +20,7 @@ package android.hardware.biometrics.fingerprint;
parcelable SensorProps {
android.hardware.biometrics.common.CommonProps commonProps;
android.hardware.biometrics.fingerprint.FingerprintSensorType sensorType;
boolean supportsNavigationGestures;
int sensorLocationX;
int sensorLocationY;
int sensorRadius;

2
biometrics/fingerprint/aidl/android/hardware/biometrics/fingerprint/ISession.aidl
View File

@@ -16,7 +16,7 @@
package android.hardware.biometrics.fingerprint;
import android.hardware.biometrics.fingerprint.ICancellationSignal;
import android.hardware.biometrics.common.ICancellationSignal;
import android.hardware.keymaster.HardwareAuthToken;
@VintfStability

6
biometrics/fingerprint/aidl/android/hardware/biometrics/fingerprint/SensorProps.aidl
View File

@@ -32,6 +32,12 @@ parcelable SensorProps {
*/
FingerprintSensorType sensorType;
/**
* Must be set to true for sensors that support "swipe" gestures via
* android.view.KeyEvent#KEYCODE_SYSTEM_NAVIGATION_*.
*/
boolean supportsNavigationGestures;
/**
* The location of the center of the sensor if applicable. For example,
* sensors of FingerprintSensorType::UNDER_DISPLAY_* would report this

1
biometrics/fingerprint/aidl/default/Android.bp
View File

@@ -8,6 +8,7 @@ cc_binary {
"libbase",
"libbinder_ndk",
"android.hardware.biometrics.fingerprint-ndk_platform",
"android.hardware.biometrics.common-unstable-ndk_platform",
],
srcs: [
"main.cpp",

2
biometrics/fingerprint/aidl/default/Fingerprint.cpp
View File

@@ -23,6 +23,7 @@ const int kSensorId = 0;
const common::SensorStrength kSensorStrength = common::SensorStrength::STRONG;
const int kMaxEnrollmentsPerUser = 5;
const FingerprintSensorType kSensorType = FingerprintSensorType::REAR;
const bool kSupportsNavigationGestures = true;
const std::string kHwDeviceName = "fingerprintSensor";
const std::string kHardwareVersion = "vendor/model/revision";
const std::string kFirmwareVersion = "1.01";
@@ -44,6 +45,7 @@ ndk::ScopedAStatus Fingerprint::getSensorProps(std::vector<SensorProps>* return_
hardwareInfos};
SensorProps props = {commonProps,
kSensorType,
kSupportsNavigationGestures,
0 /* sensorLocationX */,
0 /* sensorLocationY */,
0 /* sensorRadius */,

10
biometrics/fingerprint/aidl/default/Session.cpp
View File

@@ -14,13 +14,13 @@
* limitations under the License.
*/
#include <aidl/android/hardware/biometrics/fingerprint/BnCancellationSignal.h>
#include <aidl/android/hardware/biometrics/common/BnCancellationSignal.h>
#include "Session.h"
namespace aidl::android::hardware::biometrics::fingerprint {
class CancellationSignal : public BnCancellationSignal {
class CancellationSignal : public common::BnCancellationSignal {
public:
ndk::ScopedAStatus cancel() override { return ndk::ScopedAStatus::ok(); }
};
@@ -28,12 +28,12 @@ class CancellationSignal : public BnCancellationSignal {
Session::Session(std::shared_ptr<ISessionCallback> cb) : cb_(std::move(cb)) {}
ndk::ScopedAStatus Session::enroll(int32_t /*cookie*/, const keymaster::HardwareAuthToken& /*hat*/,
std::shared_ptr<ICancellationSignal>* /*return_val*/) {
std::shared_ptr<common::ICancellationSignal>* /*return_val*/) {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus Session::authenticate(int32_t /*cookie*/, int64_t /*keystoreOperationId*/,
std::shared_ptr<ICancellationSignal>* return_val) {
std::shared_ptr<common::ICancellationSignal>* return_val) {
if (cb_) {
cb_->onStateChanged(0, SessionState::AUTHENTICATING);
}
@@ -42,7 +42,7 @@ ndk::ScopedAStatus Session::authenticate(int32_t /*cookie*/, int64_t /*keystoreO
}
ndk::ScopedAStatus Session::detectInteraction(
int32_t /*cookie*/, std::shared_ptr<ICancellationSignal>* /*return_val*/) {
int32_t /*cookie*/, std::shared_ptr<common::ICancellationSignal>* /*return_val*/) {
return ndk::ScopedAStatus::ok();
}

9
biometrics/fingerprint/aidl/default/Session.h
View File

@@ -21,20 +21,21 @@
namespace aidl::android::hardware::biometrics::fingerprint {
namespace aidl::android::hardware::keymaster = keymaster;
namespace common = aidl::android::hardware::biometrics::common;
namespace keymaster = aidl::android::hardware::keymaster;
class Session : public BnSession {
public:
explicit Session(std::shared_ptr<ISessionCallback> cb);
ndk::ScopedAStatus enroll(int32_t cookie, const keymaster::HardwareAuthToken& hat,
std::shared_ptr<ICancellationSignal>* return_val) override;
std::shared_ptr<common::ICancellationSignal>* return_val) override;
ndk::ScopedAStatus authenticate(int32_t cookie, int64_t keystoreOperationId,
std::shared_ptr<ICancellationSignal>* return_val) override;
std::shared_ptr<common::ICancellationSignal>* return_val) override;
ndk::ScopedAStatus detectInteraction(int32_t cookie,
std::shared_ptr<ICancellationSignal>* return_val) override;
std::shared_ptr<common::ICancellationSignal>* return_val) override;
ndk::ScopedAStatus enumerateEnrollments(int32_t cookie) override;

2
biometrics/fingerprint/aidl/vts/VtsHalBiometricsFingerprintTargetTest.cpp
View File

@@ -114,7 +114,7 @@ TEST_P(Fingerprint, AuthenticateTest) {
std::shared_ptr<ISession> session;
ASSERT_TRUE(hal_->createSession(kSensorId, kUserId, session_cb, &session).isOk());
std::shared_ptr<ICancellationSignal> cancel_cb;
std::shared_ptr<common::ICancellationSignal> cancel_cb;
ASSERT_TRUE(session->authenticate(0, 0, &cancel_cb).isOk());
ASSERT_EQ(invocation_future.wait_for(kCallbackTimeout), std::future_status::ready);