summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2014-11-11 23:47:52 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-11-11 23:47:53 +0000
commitdb387066037bc6892331a5c7ea52a85d416acdaa (patch)
tree78a358fafb2d29f5bcc999387f5a9fd8cbd8ba47
parent316e75fee668c0bbf095ea8124946c5c4d396880 (diff)
parent7c8201b61f318845addecd158accada2c5428a95 (diff)
downloadframeworks_base-db387066037bc6892331a5c7ea52a85d416acdaa.zip
frameworks_base-db387066037bc6892331a5c7ea52a85d416acdaa.tar.gz
frameworks_base-db387066037bc6892331a5c7ea52a85d416acdaa.tar.bz2
Merge "Frameworks/base: Fix FingerprintManager JNI"
-rw-r--r--core/jni/android_server_FingerprintManager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android_server_FingerprintManager.cpp b/core/jni/android_server_FingerprintManager.cpp
index b174d1b..4e2d93e 100644
--- a/core/jni/android_server_FingerprintManager.cpp
+++ b/core/jni/android_server_FingerprintManager.cpp
@@ -184,7 +184,7 @@ static jint nativeCloseHal(JNIEnv* env, jobject clazz) {
// TODO: clean up void methods
static const JNINativeMethod g_methods[] = {
{ "nativeEnroll", "(I)I", (void*)nativeEnroll },
- { "nativeEnrollCancel", "()I", (void*)nativeEnroll },
+ { "nativeEnrollCancel", "()I", (void*)nativeEnrollCancel },
{ "nativeRemove", "(I)I", (void*)nativeRemove },
{ "nativeOpenHal", "()I", (void*)nativeOpenHal },
{ "nativeCloseHal", "()I", (void*)nativeCloseHal },