diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-07-15 15:01:17 -0400 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2010-07-15 15:27:38 -0400 |
| commit | ff164a7d6f839c194a52572136cfa320609598e0 (patch) | |
| tree | 7cfb8b848ae4ea6d17580f6d52522f6475456d48 /media/jni/android_media_MtpClient.cpp | |
| parent | 5a23f8c41ee83a0316ae8265841beaf6d97a66d9 (diff) | |
| download | frameworks_base-ff164a7d6f839c194a52572136cfa320609598e0.zip frameworks_base-ff164a7d6f839c194a52572136cfa320609598e0.tar.gz frameworks_base-ff164a7d6f839c194a52572136cfa320609598e0.tar.bz2 | |
Exclude MTP implementation from simulator build
Change-Id: I93364c74c26ba6e2bf6b08f1bd82802b966c8dfb
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'media/jni/android_media_MtpClient.cpp')
| -rw-r--r-- | media/jni/android_media_MtpClient.cpp | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/media/jni/android_media_MtpClient.cpp b/media/jni/android_media_MtpClient.cpp index 5c397a6..f69053c 100644 --- a/media/jni/android_media_MtpClient.cpp +++ b/media/jni/android_media_MtpClient.cpp @@ -38,6 +38,8 @@ static jmethodID method_deviceAdded; static jmethodID method_deviceRemoved; static jfieldID field_context; +#ifdef HAVE_ANDROID_OS + static void checkAndClearExceptionFromCallback(JNIEnv* env, const char* methodName) { if (env->ExceptionCheck()) { LOGE("An exception was thrown by callback '%s'.", methodName); @@ -94,52 +96,66 @@ void MyClient::deviceRemoved(MtpDevice *device) { checkAndClearExceptionFromCallback(env, __FUNCTION__); } +#endif // HAVE_ANDROID_OS + // ---------------------------------------------------------------------------- static void android_media_MtpClient_setup(JNIEnv *env, jobject thiz) { +#ifdef HAVE_ANDROID_OS LOGD("setup\n"); MyClient* client = new MyClient(env, thiz); client->start(); env->SetIntField(thiz, field_context, (int)client); +#endif } static void android_media_MtpClient_finalize(JNIEnv *env, jobject thiz) { +#ifdef HAVE_ANDROID_OS LOGD("finalize\n"); MyClient *client = (MyClient *)env->GetIntField(thiz, field_context); client->cleanup(env); delete client; env->SetIntField(thiz, field_context, 0); +#endif } static jboolean android_media_MtpClient_start(JNIEnv *env, jobject thiz) { +#ifdef HAVE_ANDROID_OS LOGD("start\n"); MyClient *client = (MyClient *)env->GetIntField(thiz, field_context); return client->start(); +#else + return false; +#endif } static void android_media_MtpClient_stop(JNIEnv *env, jobject thiz) { +#ifdef HAVE_ANDROID_OS LOGD("stop\n"); MyClient *client = (MyClient *)env->GetIntField(thiz, field_context); client->stop(); +#endif } static jboolean android_media_MtpClient_delete_object(JNIEnv *env, jobject thiz, jint device_id, jint object_id) { +#ifdef HAVE_ANDROID_OS MyClient *client = (MyClient *)env->GetIntField(thiz, field_context); MtpDevice* device = client->getDevice(device_id); if (device) return device->deleteObject(object_id); else + #endif return NULL; } @@ -147,11 +163,13 @@ static jint android_media_MtpClient_get_parent(JNIEnv *env, jobject thiz, jint device_id, jint object_id) { +#ifdef HAVE_ANDROID_OS MyClient *client = (MyClient *)env->GetIntField(thiz, field_context); MtpDevice* device = client->getDevice(device_id); if (device) return device->getParent(object_id); else +#endif return -1; } @@ -159,11 +177,13 @@ static jint android_media_MtpClient_get_storage_id(JNIEnv *env, jobject thiz, jint device_id, jint object_id) { + #ifdef HAVE_ANDROID_OS MyClient *client = (MyClient *)env->GetIntField(thiz, field_context); MtpDevice* device = client->getDevice(device_id); if (device) return device->getStorageID(object_id); else +#endif return -1; } |
