diff options
author | Mike Lockwood <lockwood@android.com> | 2011-01-06 10:38:10 -0500 |
---|---|---|
committer | Mike Lockwood <lockwood@android.com> | 2011-01-06 11:48:19 -0500 |
commit | 264f6cd0b9215f75dd5917252abea98e8fce6222 (patch) | |
tree | 0da668e2df24b638e9a76040441e6a6ed4461e77 /core/jni | |
parent | 27480cd49470af667dc8985f45b5ba43ab9ed4cd (diff) | |
download | frameworks_base-264f6cd0b9215f75dd5917252abea98e8fce6222.zip frameworks_base-264f6cd0b9215f75dd5917252abea98e8fce6222.tar.gz frameworks_base-264f6cd0b9215f75dd5917252abea98e8fce6222.tar.bz2 |
Temporarily remove UsbManager support for USB host.
A new USB host API will be added in an upcoming commit
Change-Id: I5816c10c7acd236d31ab8ae255fc83c77121eea0
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'core/jni')
-rw-r--r-- | core/jni/Android.mk | 2 | ||||
-rw-r--r-- | core/jni/AndroidRuntime.cpp | 2 | ||||
-rw-r--r-- | core/jni/android_hardware_UsbManager.cpp | 61 |
3 files changed, 0 insertions, 65 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index e9566ad..241bc3e 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -123,7 +123,6 @@ LOCAL_SRC_FILES:= \ android_media_ToneGenerator.cpp \ android_hardware_Camera.cpp \ android_hardware_SensorManager.cpp \ - android_hardware_UsbManager.cpp \ android_debug_JNITest.cpp \ android_util_FileObserver.cpp \ android/opengl/poly_clip.cpp.arm \ @@ -202,7 +201,6 @@ LOCAL_SHARED_LIBRARIES := \ libwpa_client \ libjpeg \ libnfc_ndef \ - libusbhost ifeq ($(USE_OPENGL_RENDERER),true) LOCAL_SHARED_LIBRARIES += libhwui diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index 961bc1f1..b6e4119 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -78,7 +78,6 @@ extern int register_android_opengl_jni_GLES20(JNIEnv* env); extern int register_android_hardware_Camera(JNIEnv *env); extern int register_android_hardware_SensorManager(JNIEnv *env); -extern int register_android_hardware_UsbManager(JNIEnv *env); extern int register_android_media_AudioRecord(JNIEnv *env); extern int register_android_media_AudioSystem(JNIEnv *env); @@ -1266,7 +1265,6 @@ static const RegJNIRec gRegJNI[] = { REG_JNI(register_com_android_internal_os_ZygoteInit), REG_JNI(register_android_hardware_Camera), REG_JNI(register_android_hardware_SensorManager), - REG_JNI(register_android_hardware_UsbManager), REG_JNI(register_android_media_AudioRecord), REG_JNI(register_android_media_AudioSystem), REG_JNI(register_android_media_AudioTrack), diff --git a/core/jni/android_hardware_UsbManager.cpp b/core/jni/android_hardware_UsbManager.cpp deleted file mode 100644 index 8f32abf..0000000 --- a/core/jni/android_hardware_UsbManager.cpp +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (C) 2010 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. - */ - -#include "jni.h" -#include "JNIHelp.h" -#include "android_runtime/AndroidRuntime.h" - -#include <usbhost/usbhost.h> - -#include <stdio.h> - -using namespace android; - -static jint android_hardware_UsbManager_get_device_id(JNIEnv *env, jobject clazz, jstring name) -{ - const char *nameStr = env->GetStringUTFChars(name, NULL); - int id = usb_device_get_unique_id_from_name(nameStr); - env->ReleaseStringUTFChars(name, nameStr); - return id; -} - -static jstring android_hardware_UsbManager_get_device_name(JNIEnv *env, jobject clazz, jint id) -{ - char* name = usb_device_get_name_from_unique_id(id); - jstring result = env->NewStringUTF(name); - free(name); - return result; -} - -static JNINativeMethod method_table[] = { - { "native_get_device_id", "(Ljava/lang/String;)I", - (void*)android_hardware_UsbManager_get_device_id }, - { "native_get_device_name", "(I)Ljava/lang/String;", - (void*)android_hardware_UsbManager_get_device_name }, -}; - -int register_android_hardware_UsbManager(JNIEnv *env) -{ - jclass clazz = env->FindClass("android/hardware/UsbManager"); - if (clazz == NULL) { - LOGE("Can't find android/hardware/UsbManager"); - return -1; - } - - return AndroidRuntime::registerNativeMethods(env, "android/hardware/UsbManager", - method_table, NELEM(method_table)); -} - |