diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-03-20 16:37:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-20 16:37:52 +0000 |
| commit | 5ca0045400c720f3ee63ced67aa8be6d0ff80c98 (patch) | |
| tree | 9449ddd4d7862f0b88e545daa6044fc61091869e | |
| parent | f689dfc222d6e3f4ef21721afa69a43d661f499a (diff) | |
| parent | bb6a7e43137a9095aa71640271da8584b9ef58f3 (diff) | |
| download | goldfish-5ca0045400c720f3ee63ced67aa8be6d0ff80c98.tar.gz | |
Merge "Fix a typo in the fingerprint HAL" into main
| -rw-r--r-- | fingerprint/session.cpp | 8 | ||||
| -rw-r--r-- | fingerprint/session.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/fingerprint/session.cpp b/fingerprint/session.cpp index bc28be3f..ba3f025d 100644 --- a/fingerprint/session.cpp +++ b/fingerprint/session.cpp @@ -347,7 +347,7 @@ int64_t Session::generateInt64() { return distrib(mRandom); } -void Session::onSenserEventOn(const int32_t enrollmentId) { +void Session::onSensorEventOn(const int32_t enrollmentId) { std::lock_guard<std::mutex> lock(mMutex); switch (mState) { case State::ENROLLING_START: @@ -448,7 +448,7 @@ void Session::onSenserEventOn(const int32_t enrollmentId) { } } -void Session::onSenserEventOff() {} +void Session::onSensorEventOff() {} void Session::cancellEnroll() { { @@ -532,13 +532,13 @@ bool Session::sensorListenerFuncImpl() { int32_t fid; if (sscanf(buf, "on:%d", &fid) == 1) { if (fid > 0) { - onSenserEventOn(fid); + onSensorEventOn(fid); } else { ALOGE("%p:%s: incorrect fingerprint: %d", this, __func__, fid); } } else if (!strcmp(buf, "off")) { - onSenserEventOff(); + onSensorEventOff(); } else { ALOGE("%p:%s: unexpected hw message: '%s'", this, __func__, buf); diff --git a/fingerprint/session.h b/fingerprint/session.h index 1daafcc0..d7b5ff1c 100644 --- a/fingerprint/session.h +++ b/fingerprint/session.h @@ -68,8 +68,8 @@ struct Session : public BnSession { ErrorCode validateHat(const keymaster::HardwareAuthToken& hat) const; bool sensorListenerFuncImpl(); void sensorListenerFunc() { while (sensorListenerFuncImpl()) {} } - void onSenserEventOn(int fid); - void onSenserEventOff(); + void onSensorEventOn(int fid); + void onSensorEventOff(); void cancellEnroll(); void cancellAuthenticate(); void cancellDetectInteraction(); |