commit 97a6c20a6a52c9429ed2c8837086f3003e5da274
author Vineeta Srivastava <vsrivastava@google.com> Mon Jun 23 20:38:23 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 20 00:20:03 2014 +0000
tree f3d0aa41b93e590b5dc266384e42e3488702803e
parent 24c492d3bb3db84873f9e4143df7cf1b58531c50
parent a2e897428aad870b909d7d13460bcdf4d221e39d

Merge "Removed hack for fingerprint HAL."

core/jni/android_server_FingerprintManager.cpp

diff --git a/core/jni/android_server_FingerprintManager.cpp b/core/jni/android_server_FingerprintManager.cpp
index ad36843c..b174d1b 100644
--- a/core/jni/android_server_FingerprintManager.cpp
+++ b/core/jni/android_server_FingerprintManager.cpp
@@ -57,21 +57,11 @@
     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;