summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Vineeta Srivastava <vsrivastava@google.com> 2014-06-23 20:38:23 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2014-06-20 00:20:03 +0000
commit97a6c20a6a52c9429ed2c8837086f3003e5da274 (patch)
treef3d0aa41b93e590b5dc266384e42e3488702803e
parent24c492d3bb3db84873f9e4143df7cf1b58531c50 (diff)
parenta2e897428aad870b909d7d13460bcdf4d221e39d (diff)
Merge "Removed hack for fingerprint HAL."
-rw-r--r--core/jni/android_server_FingerprintManager.cpp10
1 files changed, 0 insertions, 10 deletions
diff --git a/core/jni/android_server_FingerprintManager.cpp b/core/jni/android_server_FingerprintManager.cpp
index ad36843c764b..b174d1b0f853 100644
--- a/core/jni/android_server_FingerprintManager.cpp
+++ b/core/jni/android_server_FingerprintManager.cpp
@@ -57,21 +57,11 @@ static struct {
fingerprint_device_t *device;
} gContext;
-// TODO: remove after driver update to use new HAL
-fingerprint_msg_type_t hackTilFpDriverUpdate(fingerprint_msg_type_t t) {
- switch(static_cast<int>(t)) {
- case 1: return FINGERPRINT_PROCESSED;
- case 2: return FINGERPRINT_TEMPLATE_ENROLLING;
- default: return t;
- }
-}
-
// Called by the HAL to notify us of fingerprint events
static void hal_notify_callback(fingerprint_msg_t msg) {
uint32_t arg1 = 0;
uint32_t arg2 = 0;
uint32_t arg3 = 0; // TODO
- msg.type = hackTilFpDriverUpdate(msg.type);
switch (msg.type) {
case FINGERPRINT_ERROR:
arg1 = msg.data.error;