diff options
Diffstat (limited to 'core')
-rw-r--r-- | core/java/android/app/SystemServiceRegistry.java | 4 | ||||
-rw-r--r-- | core/java/android/hardware/fingerprint/Fingerprint.aidl (renamed from core/java/android/service/fingerprint/Fingerprint.aidl) | 2 | ||||
-rw-r--r-- | core/java/android/hardware/fingerprint/Fingerprint.java (renamed from core/java/android/service/fingerprint/Fingerprint.java) | 2 | ||||
-rw-r--r-- | core/java/android/hardware/fingerprint/FingerprintManager.java (renamed from core/java/android/service/fingerprint/FingerprintManager.java) | 4 | ||||
-rw-r--r-- | core/java/android/hardware/fingerprint/FingerprintUtils.java (renamed from core/java/android/service/fingerprint/FingerprintUtils.java) | 2 | ||||
-rw-r--r-- | core/java/android/hardware/fingerprint/IFingerprintService.aidl (renamed from core/java/android/service/fingerprint/IFingerprintService.aidl) | 6 | ||||
-rw-r--r-- | core/java/android/hardware/fingerprint/IFingerprintServiceReceiver.aidl (renamed from core/java/android/service/fingerprint/IFingerprintServiceReceiver.aidl) | 2 | ||||
-rw-r--r-- | core/jni/Android.mk | 1 | ||||
-rw-r--r-- | core/jni/android_server_FingerprintManager.cpp | 207 |
9 files changed, 11 insertions, 219 deletions
diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java index a0f40f6..b3aa6be 100644 --- a/core/java/android/app/SystemServiceRegistry.java +++ b/core/java/android/app/SystemServiceRegistry.java @@ -99,8 +99,8 @@ import android.os.Vibrator; import android.os.storage.StorageManager; import android.print.IPrintManager; import android.print.PrintManager; -import android.service.fingerprint.FingerprintManager; -import android.service.fingerprint.IFingerprintService; +import android.hardware.fingerprint.FingerprintManager; +import android.hardware.fingerprint.IFingerprintService; import android.service.persistentdata.IPersistentDataBlockService; import android.service.persistentdata.PersistentDataBlockManager; import android.telecom.TelecomManager; diff --git a/core/java/android/service/fingerprint/Fingerprint.aidl b/core/java/android/hardware/fingerprint/Fingerprint.aidl index c9fd989..4743354 100644 --- a/core/java/android/service/fingerprint/Fingerprint.aidl +++ b/core/java/android/hardware/fingerprint/Fingerprint.aidl @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package android.service.fingerprint; +package android.hardware.fingerprint; // @hide parcelable Fingerprint; diff --git a/core/java/android/service/fingerprint/Fingerprint.java b/core/java/android/hardware/fingerprint/Fingerprint.java index 37552eb..c307634 100644 --- a/core/java/android/service/fingerprint/Fingerprint.java +++ b/core/java/android/hardware/fingerprint/Fingerprint.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package android.service.fingerprint; +package android.hardware.fingerprint; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/java/android/service/fingerprint/FingerprintManager.java b/core/java/android/hardware/fingerprint/FingerprintManager.java index bb90e40..e3572a2 100644 --- a/core/java/android/service/fingerprint/FingerprintManager.java +++ b/core/java/android/hardware/fingerprint/FingerprintManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.service.fingerprint; +package android.hardware.fingerprint; import android.app.ActivityManagerNative; import android.content.ContentResolver; @@ -28,7 +28,7 @@ import android.os.Parcelable; import android.os.RemoteException; import android.os.UserHandle; import android.provider.Settings; -import android.service.fingerprint.FingerprintManager.EnrollmentCallback; +import android.hardware.fingerprint.FingerprintManager.EnrollmentCallback; import android.util.Log; import android.util.Slog; diff --git a/core/java/android/service/fingerprint/FingerprintUtils.java b/core/java/android/hardware/fingerprint/FingerprintUtils.java index 62acbb9..ae3d4a4 100644 --- a/core/java/android/service/fingerprint/FingerprintUtils.java +++ b/core/java/android/hardware/fingerprint/FingerprintUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.service.fingerprint; +package android.hardware.fingerprint; import android.content.ContentResolver; import android.provider.Settings; diff --git a/core/java/android/service/fingerprint/IFingerprintService.aidl b/core/java/android/hardware/fingerprint/IFingerprintService.aidl index e5d3ad4..c5a45e2 100644 --- a/core/java/android/service/fingerprint/IFingerprintService.aidl +++ b/core/java/android/hardware/fingerprint/IFingerprintService.aidl @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package android.service.fingerprint; +package android.hardware.fingerprint; import android.os.Bundle; -import android.service.fingerprint.IFingerprintServiceReceiver; -import android.service.fingerprint.Fingerprint; +import android.hardware.fingerprint.IFingerprintServiceReceiver; +import android.hardware.fingerprint.Fingerprint; import java.util.List; /** diff --git a/core/java/android/service/fingerprint/IFingerprintServiceReceiver.aidl b/core/java/android/hardware/fingerprint/IFingerprintServiceReceiver.aidl index f025064..e82395f 100644 --- a/core/java/android/service/fingerprint/IFingerprintServiceReceiver.aidl +++ b/core/java/android/hardware/fingerprint/IFingerprintServiceReceiver.aidl @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package android.service.fingerprint; +package android.hardware.fingerprint; import android.os.Bundle; import android.os.UserHandle; diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 84568e4..cd117eb1 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -151,7 +151,6 @@ LOCAL_SRC_FILES:= \ android_util_FileObserver.cpp \ android/opengl/poly_clip.cpp.arm \ android/opengl/util.cpp \ - android_server_FingerprintManager.cpp \ android_server_NetworkManagementSocketTagger.cpp \ android_server_Watchdog.cpp \ android_ddm_DdmHandleNativeHeap.cpp \ diff --git a/core/jni/android_server_FingerprintManager.cpp b/core/jni/android_server_FingerprintManager.cpp deleted file mode 100644 index 5d59234..0000000 --- a/core/jni/android_server_FingerprintManager.cpp +++ /dev/null @@ -1,207 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#define LOG_TAG "Fingerprint-JNI" - -#include "JNIHelp.h" -#include <inttypes.h> - -#include <android_runtime/AndroidRuntime.h> -#include <android_runtime/Log.h> -#include <android_os_MessageQueue.h> -#include <hardware/hardware.h> -#include <hardware/fingerprint.h> -#include <utils/Log.h> -#include <utils/Looper.h> -#include "core_jni_helpers.h" - -namespace android { - -static const uint16_t kVersion = HARDWARE_MODULE_API_VERSION(2, 0); - -static const char* FINGERPRINT_SERVICE = "com/android/server/fingerprint/FingerprintService"; -static struct { - jclass clazz; - jmethodID notify; -} gFingerprintServiceClassInfo; - -static struct { - fingerprint_module_t const* module; - fingerprint_device_t *device; -} gContext; - -static sp<Looper> gLooper; -static jobject gCallback; - -class CallbackHandler : public MessageHandler { - int type; - int arg1, arg2, arg3; -public: - CallbackHandler(int type, int arg1, int arg2, int arg3) - : type(type), arg1(arg1), arg2(arg2), arg3(arg3) { } - - virtual void handleMessage(const Message& message) { - //ALOG(LOG_VERBOSE, LOG_TAG, "hal_notify(msg=%d, arg1=%d, arg2=%d)\n", msg.type, arg1, arg2); - JNIEnv* env = AndroidRuntime::getJNIEnv(); - env->CallVoidMethod(gCallback, gFingerprintServiceClassInfo.notify, type, arg1, arg2, arg3); - } -}; - -// 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; - switch (msg.type) { - case FINGERPRINT_ERROR: - arg1 = msg.data.error; - break; - case FINGERPRINT_ACQUIRED: - arg1 = msg.data.acquired.acquired_info; - break; - case FINGERPRINT_PROCESSED: - arg1 = msg.data.processed.finger.fid; - arg2 = msg.data.processed.finger.gid; - break; - case FINGERPRINT_TEMPLATE_ENROLLING: - arg1 = msg.data.enroll.finger.fid; - arg2 = msg.data.enroll.finger.gid; - arg3 = msg.data.enroll.samples_remaining; - break; - case FINGERPRINT_TEMPLATE_REMOVED: - arg1 = msg.data.removed.finger.fid; - arg2 = msg.data.removed.finger.gid; - break; - default: - ALOGE("fingerprint: invalid msg: %d", msg.type); - return; - } - // This call potentially comes in on a thread not owned by us. Hand it off to our - // looper so it runs on our thread when calling back to FingerprintService. - // CallbackHandler object is reference-counted, so no cleanup necessary. - gLooper->sendMessage(new CallbackHandler(msg.type, arg1, arg2, arg3), Message()); -} - -static void nativeInit(JNIEnv *env, jobject clazz, jobject mQueue, jobject callbackObj) { - ALOG(LOG_VERBOSE, LOG_TAG, "nativeInit()\n"); - gCallback = MakeGlobalRefOrDie(env, callbackObj); - gLooper = android_os_MessageQueue_getMessageQueue(env, mQueue)->getLooper(); -} - -static jint nativeEnroll(JNIEnv* env, jobject clazz, jint timeout, jint groupId) { - ALOG(LOG_VERBOSE, LOG_TAG, "nativeEnroll(gid=%d, timeout=%d)\n", groupId, timeout); - int ret = gContext.device->enroll(gContext.device, groupId, timeout); - return reinterpret_cast<jint>(ret); -} - -static jint nativeAuthenticate(JNIEnv* env, jobject clazz, jlong sessionId, jint groupId) { - ALOG(LOG_VERBOSE, LOG_TAG, "nativeAuthenticate(sid=%" PRId64 ", gid=%d)\n", sessionId, groupId); - int ret = gContext.device->authenticate(gContext.device, sessionId, groupId); - return reinterpret_cast<jint>(ret); -} - -static jint nativeEnrollCancel(JNIEnv* env, jobject clazz) { - ALOG(LOG_VERBOSE, LOG_TAG, "nativeEnrollCancel()\n"); - int ret = gContext.device->enroll_cancel(gContext.device); - return reinterpret_cast<jint>(ret); -} - -static jint nativeRemove(JNIEnv* env, jobject clazz, jint fingerId, jint groupId) { - ALOG(LOG_VERBOSE, LOG_TAG, "nativeRemove(fid=%d, gid=%d)\n", fingerId, groupId); - fingerprint_finger_id_t finger; - finger.fid = fingerId; - finger.gid = groupId; - int ret = gContext.device->remove(gContext.device, finger); - return reinterpret_cast<jint>(ret); -} - -static jint nativeOpenHal(JNIEnv* env, jobject clazz) { - ALOG(LOG_VERBOSE, LOG_TAG, "nativeOpenHal()\n"); - int err; - const hw_module_t *hw_module = NULL; - if (0 != (err = hw_get_module(FINGERPRINT_HARDWARE_MODULE_ID, &hw_module))) { - ALOGE("Can't open fingerprint HW Module, error: %d", err); - return 0; - } - if (NULL == hw_module) { - ALOGE("No valid fingerprint module"); - return 0; - } - - gContext.module = reinterpret_cast<const fingerprint_module_t*>(hw_module); - - if (gContext.module->common.methods->open == NULL) { - ALOGE("No valid open method"); - return 0; - } - - hw_device_t *device = NULL; - - if (0 != (err = gContext.module->common.methods->open(hw_module, NULL, &device))) { - ALOGE("Can't open fingerprint methods, error: %d", err); - return 0; - } - - if (kVersion != device->version) { - ALOGE("Wrong fp version. Expected %d, got %d", kVersion, device->version); - // return 0; // FIXME - } - - gContext.device = reinterpret_cast<fingerprint_device_t*>(device); - err = gContext.device->set_notify(gContext.device, hal_notify_callback); - if (err < 0) { - ALOGE("Failed in call to set_notify(), err=%d", err); - return 0; - } - - // Sanity check - remove - if (gContext.device->notify != hal_notify_callback) { - ALOGE("NOTIFY not set properly: %p != %p", gContext.device->notify, hal_notify_callback); - } - - ALOG(LOG_VERBOSE, LOG_TAG, "fingerprint HAL successfully initialized"); - return reinterpret_cast<jlong>(gContext.device); -} - -static jint nativeCloseHal(JNIEnv* env, jobject clazz) { - return -ENOSYS; // TODO -} - -// ---------------------------------------------------------------------------- - -// TODO: clean up void methods -static const JNINativeMethod g_methods[] = { - { "nativeAuthenticate", "(JI)I", (void*)nativeAuthenticate }, - { "nativeEnroll", "(II)I", (void*)nativeEnroll }, - { "nativeEnrollCancel", "()I", (void*)nativeEnrollCancel }, - { "nativeRemove", "(II)I", (void*)nativeRemove }, - { "nativeOpenHal", "()I", (void*)nativeOpenHal }, - { "nativeCloseHal", "()I", (void*)nativeCloseHal }, - { "nativeInit","(Landroid/os/MessageQueue;" - "Lcom/android/server/fingerprint/FingerprintService;)V", (void*)nativeInit } -}; - -int register_android_server_fingerprint_FingerprintService(JNIEnv* env) { - jclass clazz = FindClassOrDie(env, FINGERPRINT_SERVICE); - gFingerprintServiceClassInfo.clazz = MakeGlobalRefOrDie(env, clazz); - gFingerprintServiceClassInfo.notify = - GetMethodIDOrDie(env, gFingerprintServiceClassInfo.clazz,"notify", "(IIII)V"); - int result = RegisterMethodsOrDie(env, FINGERPRINT_SERVICE, g_methods, NELEM(g_methods)); - ALOG(LOG_VERBOSE, LOG_TAG, "FingerprintManager JNI ready.\n"); - return result; -} - -} // namespace android |