summaryrefslogtreecommitdiffstats
path: root/media/jni
diff options
context:
space:
mode:
Diffstat (limited to 'media/jni')
-rw-r--r--media/jni/Android.mk2
-rw-r--r--media/jni/android_media_MediaPlayer.cpp12
-rw-r--r--media/jni/android_mtp_PtpClient.cpp254
-rw-r--r--media/jni/android_mtp_PtpCursor.cpp136
4 files changed, 0 insertions, 404 deletions
diff --git a/media/jni/Android.mk b/media/jni/Android.mk
index a8943cd..ab6e512 100644
--- a/media/jni/Android.mk
+++ b/media/jni/Android.mk
@@ -11,8 +11,6 @@ LOCAL_SRC_FILES:= \
android_media_AmrInputStream.cpp \
android_mtp_MtpDatabase.cpp \
android_mtp_MtpServer.cpp \
- android_mtp_PtpClient.cpp \
- android_mtp_PtpCursor.cpp \
LOCAL_SHARED_LIBRARIES := \
libandroid_runtime \
diff --git a/media/jni/android_media_MediaPlayer.cpp b/media/jni/android_media_MediaPlayer.cpp
index 6a0d767..f0609b2 100644
--- a/media/jni/android_media_MediaPlayer.cpp
+++ b/media/jni/android_media_MediaPlayer.cpp
@@ -777,8 +777,6 @@ extern int register_android_media_MediaProfiles(JNIEnv *env);
extern int register_android_media_AmrInputStream(JNIEnv *env);
extern int register_android_mtp_MtpDatabase(JNIEnv *env);
extern int register_android_mtp_MtpServer(JNIEnv *env);
-extern int register_android_mtp_PtpClient(JNIEnv *env);
-extern int register_android_mtp_PtpCursor(JNIEnv *env);
jint JNI_OnLoad(JavaVM* vm, void* reserved)
{
@@ -826,16 +824,6 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved)
goto bail;
}
- if (register_android_mtp_PtpClient(env) < 0) {
- LOGE("ERROR: PtpClient native registration failed");
- goto bail;
- }
-
- if (register_android_mtp_PtpCursor(env) < 0) {
- LOGE("ERROR: PtpCursor native registration failed");
- goto bail;
- }
-
if (register_android_mtp_MtpDatabase(env) < 0) {
LOGE("ERROR: MtpDatabase native registration failed");
goto bail;
diff --git a/media/jni/android_mtp_PtpClient.cpp b/media/jni/android_mtp_PtpClient.cpp
deleted file mode 100644
index 4e7b77e..0000000
--- a/media/jni/android_mtp_PtpClient.cpp
+++ /dev/null
@@ -1,254 +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.
- */
-
-#define LOG_TAG "PtpClientJNI"
-#include "utils/Log.h"
-
-#include <stdio.h>
-#include <assert.h>
-#include <limits.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-#include "jni.h"
-#include "JNIHelp.h"
-#include "android_runtime/AndroidRuntime.h"
-#include "private/android_filesystem_config.h"
-
-#include "MtpClient.h"
-#include "MtpDevice.h"
-#include "MtpObjectInfo.h"
-
-using namespace android;
-
-// ----------------------------------------------------------------------------
-
-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);
- LOGE_EX(env);
- env->ExceptionClear();
- }
-}
-
-class MyClient : public MtpClient {
-private:
- virtual void deviceAdded(MtpDevice *device);
- virtual void deviceRemoved(MtpDevice *device);
-
- jobject mClient;
- MtpDevice* mEventDevice;
-
-public:
- MyClient(JNIEnv *env, jobject client);
- void cleanup(JNIEnv *env);
-};
-
-MtpClient* get_client_from_object(JNIEnv* env, jobject javaClient)
-{
- return (MtpClient*)env->GetIntField(javaClient, field_context);
-}
-
-
-MyClient::MyClient(JNIEnv *env, jobject client)
- : mClient(env->NewGlobalRef(client))
-{
-}
-
-void MyClient::cleanup(JNIEnv *env) {
- env->DeleteGlobalRef(mClient);
-}
-
-void MyClient::deviceAdded(MtpDevice *device) {
- JNIEnv* env = AndroidRuntime::getJNIEnv();
- const char* name = device->getDeviceName();
- LOGD("MyClient::deviceAdded %s\n", name);
-
- env->CallVoidMethod(mClient, method_deviceAdded, device->getID());
-
- checkAndClearExceptionFromCallback(env, __FUNCTION__);
-}
-
-void MyClient::deviceRemoved(MtpDevice *device) {
- JNIEnv* env = AndroidRuntime::getJNIEnv();
- const char* name = device->getDeviceName();
- LOGD("MyClient::deviceRemoved %s\n", name);
-
- env->CallVoidMethod(mClient, method_deviceRemoved, device->getID());
-
- checkAndClearExceptionFromCallback(env, __FUNCTION__);
-}
-
-#endif // HAVE_ANDROID_OS
-
-// ----------------------------------------------------------------------------
-
-static void
-android_mtp_PtpClient_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_mtp_PtpClient_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_mtp_PtpClient_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_mtp_PtpClient_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_mtp_PtpClient_delete_object(JNIEnv *env, jobject thiz,
- jint device_id, jlong 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;
-}
-
-static jlong
-android_mtp_PtpClient_get_parent(JNIEnv *env, jobject thiz,
- jint device_id, jlong 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;
-}
-
-static jlong
-android_mtp_PtpClient_get_storage_id(JNIEnv *env, jobject thiz,
- jint device_id, jlong 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;
-}
-
-static jboolean
-android_mtp_PtpClient_import_file(JNIEnv *env, jobject thiz,
- jint device_id, jlong object_id, jstring dest_path)
-{
-#ifdef HAVE_ANDROID_OS
- MyClient *client = (MyClient *)env->GetIntField(thiz, field_context);
- MtpDevice* device = client->getDevice(device_id);
- if (device) {
- const char *destPathStr = env->GetStringUTFChars(dest_path, NULL);
- bool result = device->readObject(object_id, destPathStr, AID_SDCARD_RW, 0664);
- env->ReleaseStringUTFChars(dest_path, destPathStr);
- return result;
- }
-#endif
- return NULL;
-}
-
-// ----------------------------------------------------------------------------
-
-static JNINativeMethod gMethods[] = {
- {"native_setup", "()V", (void *)android_mtp_PtpClient_setup},
- {"native_finalize", "()V", (void *)android_mtp_PtpClient_finalize},
- {"native_start", "()Z", (void *)android_mtp_PtpClient_start},
- {"native_stop", "()V", (void *)android_mtp_PtpClient_stop},
- {"native_delete_object", "(IJ)Z", (void *)android_mtp_PtpClient_delete_object},
- {"native_get_parent", "(IJ)J", (void *)android_mtp_PtpClient_get_parent},
- {"native_get_storage_id", "(IJ)J", (void *)android_mtp_PtpClient_get_storage_id},
- {"native_import_file", "(IJLjava/lang/String;)Z",
- (void *)android_mtp_PtpClient_import_file},
-};
-
-static const char* const kClassPathName = "android/mtp/PtpClient";
-
-int register_android_mtp_PtpClient(JNIEnv *env)
-{
- jclass clazz;
-
- LOGD("register_android_mtp_PtpClient\n");
-
- clazz = env->FindClass("android/mtp/PtpClient");
- if (clazz == NULL) {
- LOGE("Can't find android/mtp/PtpClient");
- return -1;
- }
- method_deviceAdded = env->GetMethodID(clazz, "deviceAdded", "(I)V");
- if (method_deviceAdded == NULL) {
- LOGE("Can't find deviceAdded");
- return -1;
- }
- method_deviceRemoved = env->GetMethodID(clazz, "deviceRemoved", "(I)V");
- if (method_deviceRemoved == NULL) {
- LOGE("Can't find deviceRemoved");
- return -1;
- }
- field_context = env->GetFieldID(clazz, "mNativeContext", "I");
- if (field_context == NULL) {
- LOGE("Can't find PtpClient.mNativeContext");
- return -1;
- }
-
- return AndroidRuntime::registerNativeMethods(env,
- "android/mtp/PtpClient", gMethods, NELEM(gMethods));
-}
diff --git a/media/jni/android_mtp_PtpCursor.cpp b/media/jni/android_mtp_PtpCursor.cpp
deleted file mode 100644
index 43ae1f3..0000000
--- a/media/jni/android_mtp_PtpCursor.cpp
+++ /dev/null
@@ -1,136 +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.
- */
-
-#define LOG_TAG "PtpCursorJNI"
-#include "utils/Log.h"
-
-#include <stdio.h>
-#include <assert.h>
-#include <limits.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-#include "jni.h"
-#include "JNIHelp.h"
-#include "android_runtime/AndroidRuntime.h"
-#include "binder/CursorWindow.h"
-
-#include "MtpClient.h"
-#include "PtpCursor.h"
-
-using namespace android;
-
-// ----------------------------------------------------------------------------
-
-static jfieldID field_context;
-
-// From android_mtp_PtpClient.cpp
-MtpClient * get_client_from_object(JNIEnv * env, jobject javaClient);
-
-// ----------------------------------------------------------------------------
-
-static bool ExceptionCheck(void* env)
-{
- return ((JNIEnv *)env)->ExceptionCheck();
-}
-
-static void
-android_mtp_PtpCursor_setup(JNIEnv *env, jobject thiz, jobject javaClient,
- jint queryType, jint deviceID, jlong storageID, jlong objectID, jintArray javaColumns)
-{
-#ifdef HAVE_ANDROID_OS
- LOGD("android_mtp_PtpCursor_setup queryType: %d deviceID: %d storageID: %lld objectID: %lld\n",
- queryType, deviceID, storageID, objectID);
-
- int* columns = NULL;
- int columnCount = 0;
- if (javaColumns) {
- columns = env->GetIntArrayElements(javaColumns, 0);
- columnCount = env->GetArrayLength(javaColumns);
- }
-
- MtpClient* client = get_client_from_object(env, javaClient);
- PtpCursor* cursor = new PtpCursor(client, queryType,
- deviceID, storageID, objectID, columnCount, columns);
-
- if (columns)
- env->ReleaseIntArrayElements(javaColumns, columns, 0);
- env->SetIntField(thiz, field_context, (int)cursor);
-#endif
-}
-
-static void
-android_mtp_PtpCursor_finalize(JNIEnv *env, jobject thiz)
-{
-#ifdef HAVE_ANDROID_OS
- LOGD("finalize\n");
- PtpCursor *cursor = (PtpCursor *)env->GetIntField(thiz, field_context);
- delete cursor;
-#endif
-}
-
-static jint
-android_mtp_PtpCursor_fill_window(JNIEnv *env, jobject thiz, jobject javaWindow, jint startPos)
-{
-#ifdef HAVE_ANDROID_OS
- CursorWindow* window = get_window_from_object(env, javaWindow);
- if (!window) {
- LOGE("Invalid CursorWindow");
- jniThrowException(env, "java/lang/IllegalArgumentException",
- "Bad CursorWindow");
- return 0;
- }
- PtpCursor *cursor = (PtpCursor *)env->GetIntField(thiz, field_context);
-
- return cursor->fillWindow(window, startPos);
-#else
- return 0;
-#endif
-}
-
-// ----------------------------------------------------------------------------
-
-static JNINativeMethod gMethods[] = {
- {"native_setup", "(Landroid/mtp/PtpClient;IIJJ[I)V",
- (void *)android_mtp_PtpCursor_setup},
- {"native_finalize", "()V", (void *)android_mtp_PtpCursor_finalize},
- {"native_fill_window", "(Landroid/database/CursorWindow;I)I",
- (void *)android_mtp_PtpCursor_fill_window},
-
-};
-
-static const char* const kClassPathName = "android/mtp/PtpCursor";
-
-int register_android_mtp_PtpCursor(JNIEnv *env)
-{
- jclass clazz;
-
- LOGD("register_android_mtp_PtpCursor\n");
-
- clazz = env->FindClass("android/mtp/PtpCursor");
- if (clazz == NULL) {
- LOGE("Can't find android/mtp/PtpCursor");
- return -1;
- }
- field_context = env->GetFieldID(clazz, "mNativeContext", "I");
- if (field_context == NULL) {
- LOGE("Can't find PtpCursor.mNativeContext");
- return -1;
- }
-
- return AndroidRuntime::registerNativeMethods(env,
- "android/mtp/PtpCursor", gMethods, NELEM(gMethods));
-}
generated by cgit v1.1 at 2024-09-08 14:34:55 +0000