diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-12 02:53:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-12 02:53:17 +0000 |
| commit | dbf16c6fa0d1ab4e8bc8f3ca61ae4b0ce5d38a8f (patch) | |
| tree | f83b3804732fb16ac7d0882c0b089366eea09296 | |
| parent | a156c5a60cd67390bfe76ddb80045ce23635a0f5 (diff) | |
| parent | db387066037bc6892331a5c7ea52a85d416acdaa (diff) | |
| download | frameworks_base-dbf16c6fa0d1ab4e8bc8f3ca61ae4b0ce5d38a8f.zip frameworks_base-dbf16c6fa0d1ab4e8bc8f3ca61ae4b0ce5d38a8f.tar.gz frameworks_base-dbf16c6fa0d1ab4e8bc8f3ca61ae4b0ce5d38a8f.tar.bz2 | |
am db387066: Merge "Frameworks/base: Fix FingerprintManager JNI"
* commit 'db387066037bc6892331a5c7ea52a85d416acdaa':
Frameworks/base: Fix FingerprintManager JNI
| -rw-r--r-- | core/jni/android_server_FingerprintManager.cpp | 2 |
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 }, |