MTP: Add MtpServer Java class to wrap MTP device support. (98ef64e4) · Commits · e / os / android_frameworks_base

core/jni/Android.mk

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -114,6 +114,7 @@ LOCAL_SRC_FILES:= \
	android_media_JetPlayer.cpp \		android_media_JetPlayer.cpp \
	android_media_MtpClient.cpp \		android_media_MtpClient.cpp \
	android_media_MtpCursor.cpp \		android_media_MtpCursor.cpp \
			android_media_MtpServer.cpp \
	android_media_ToneGenerator.cpp \		android_media_ToneGenerator.cpp \
	android_hardware_Camera.cpp \		android_hardware_Camera.cpp \
	android_hardware_SensorManager.cpp \		android_hardware_SensorManager.cpp \
	@@ -193,9 +194,10 @@ LOCAL_SHARED_LIBRARIES := \
	libicudata \		libicudata \
	libmedia \		libmedia \
	libwpa_client \		libwpa_client \
	libjpeg		libjpeg \
			libstagefright

	LOCAL_STATIC_LIBRARIES := libmtphost libusbhost		LOCAL_STATIC_LIBRARIES := libmtp libusbhost

	ifeq ($(BOARD_HAVE_BLUETOOTH),true)		ifeq ($(BOARD_HAVE_BLUETOOTH),true)
	LOCAL_C_INCLUDES += \		LOCAL_C_INCLUDES += \

core/jni/AndroidRuntime.cpp

+2 −0

core/jni/android_media_MtpServer.cpp

0 → 100644

+162 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* 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 "MtpServerJNI"
			#include "utils/Log.h"

			#include <stdio.h>
			#include <assert.h>
			#include <limits.h>
			#include <unistd.h>
			#include <fcntl.h>
			#include <utils/threads.h>

			#include "jni.h"
			#include "JNIHelp.h"
			#include "android_runtime/AndroidRuntime.h"

			#include "MtpServer.h"

			namespace android {

			// ----------------------------------------------------------------------------

			static jfieldID field_context;


			// ----------------------------------------------------------------------------

			static bool ExceptionCheck(void* env)
			{
			return ((JNIEnv *)env)->ExceptionCheck();
			}

			class MtpThread : public Thread {
			private:
			String8 mStoragePath;
			String8 mDatabasePath;
			bool mDone;
			bool mScannedOnce;

			public:
			MtpThread(const char* storagePath, const char* databasePath)
			: mStoragePath(storagePath), mDatabasePath(databasePath), mDone(false), mScannedOnce(false)
			{
			}

			virtual bool threadLoop() {
			int fd = open("/dev/mtp_usb", O_RDWR);
			printf("open returned %d\n", fd);
			if (fd < 0) {
			LOGE("could not open MTP driver\n");
			return false;
			}

			MtpServer* server = new MtpServer(fd, mDatabasePath);
			server->addStorage(mStoragePath);

			// temporary
			LOGD("MtpThread server->scanStorage");
			server->scanStorage();
			LOGD("MtpThread server->run");
			server->run();
			close(fd);
			delete server;

			bool done = mDone;
			if (done)
			delete this;
			LOGD("threadLoop returning %s", (done ? "false" : "true"));
			return !done;
			}

			void setDone() { mDone = true; }
			};

			static void
			android_media_MtpServer_setup(JNIEnv *env, jobject thiz, jstring storagePath, jstring databasePath)
			{
			LOGD("setup\n");

			const char *storagePathStr = env->GetStringUTFChars(storagePath, NULL);
			const char *databasePathStr = env->GetStringUTFChars(databasePath, NULL);

			MtpThread* thread = new MtpThread(storagePathStr, databasePathStr);
			env->SetIntField(thiz, field_context, (int)thread);

			env->ReleaseStringUTFChars(storagePath, storagePathStr);
			env->ReleaseStringUTFChars(databasePath, databasePathStr);
			}

			static void
			android_media_MtpServer_finalize(JNIEnv *env, jobject thiz)
			{
			LOGD("finalize\n");
			}


			static void
			android_media_MtpServer_start(JNIEnv *env, jobject thiz)
			{
			LOGD("start\n");
			MtpThread thread = (MtpThread )env->GetIntField(thiz, field_context);
			thread->run("MtpThread");
			}

			static void
			android_media_MtpServer_stop(JNIEnv *env, jobject thiz)
			{
			LOGD("stop\n");
			MtpThread thread = (MtpThread )env->GetIntField(thiz, field_context);
			if (thread) {
			thread->setDone();
			env->SetIntField(thiz, field_context, 0);
			}
			}

			// ----------------------------------------------------------------------------

			static JNINativeMethod gMethods[] = {
			{"native_setup", "(Ljava/lang/String;Ljava/lang/String;)V", (void *)android_media_MtpServer_setup},
			{"native_finalize", "()V", (void *)android_media_MtpServer_finalize},
			{"native_start", "()V", (void *)android_media_MtpServer_start},
			{"native_stop", "()V", (void *)android_media_MtpServer_stop},
			};

			static const char* const kClassPathName = "android/media/MtpServer";

			int register_android_media_MtpServer(JNIEnv *env)
			{
			jclass clazz;

			LOGD("register_android_media_MtpServer\n");

			clazz = env->FindClass("android/media/MtpServer");
			if (clazz == NULL) {
			LOGE("Can't find android/media/MtpServer");
			return -1;
			}
			field_context = env->GetFieldID(clazz, "mNativeContext", "I");
			if (field_context == NULL) {
			LOGE("Can't find MtpServer.mNativeContext");
			return -1;
			}

			return AndroidRuntime::registerNativeMethods(env,
			"android/media/MtpServer", gMethods, NELEM(gMethods));
			}

			} // namespace android

media/java/android/media/MtpServer.java

0 → 100644

+57 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* 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.
			*/

			package android.media;

			import android.util.Log;

			/**
			* Java wrapper for MTP/PTP support as USB responder.
			* {@hide}
			*/
			public class MtpServer {

			private static final String TAG = "MtpServer";

			static {
			System.loadLibrary("media_jni");
			}

			public MtpServer(String storagePath, String databasePath) {
			native_setup(storagePath, databasePath);
			}

			@Override
			protected void finalize() {
			native_finalize();
			}

			public void start() {
			native_start();
			}

			public void stop() {
			native_stop();
			}

			// used by the JNI code
			private int mNativeContext;

			private native final void native_setup(String storagePath, String databasePath);
			private native final void native_finalize();
			private native final void native_start();
			private native final void native_stop();
			}

media/mtp/Android.mk

+20 −27

Original line number	Original line	Diff line number	Diff line
	@@ -20,59 +20,52 @@ ifneq ($(TARGET_SIMULATOR),true)
	include $(CLEAR_VARS)		include $(CLEAR_VARS)

	LOCAL_SRC_FILES:= \		LOCAL_SRC_FILES:= \
	mtptest.cpp \		MtpClient.cpp \
			MtpCursor.cpp \
	MtpDatabase.cpp \		MtpDatabase.cpp \
	MtpDataPacket.cpp \		MtpDataPacket.cpp \
	MtpDebug.cpp \		MtpDebug.cpp \
			MtpDevice.cpp \
			MtpDeviceInfo.cpp \
	MtpMediaScanner.cpp \		MtpMediaScanner.cpp \
			MtpObjectInfo.cpp \
	MtpPacket.cpp \		MtpPacket.cpp \
			MtpProperty.cpp \
	MtpRequestPacket.cpp \		MtpRequestPacket.cpp \
	MtpResponsePacket.cpp \		MtpResponsePacket.cpp \
	MtpServer.cpp \		MtpServer.cpp \
			MtpStorageInfo.cpp \
	MtpStringBuffer.cpp \		MtpStringBuffer.cpp \
	MtpStorage.cpp \		MtpStorage.cpp \
	MtpUtils.cpp \		MtpUtils.cpp \
	SqliteDatabase.cpp \		SqliteDatabase.cpp \
	SqliteStatement.cpp \		SqliteStatement.cpp \

	LOCAL_MODULE:= mtptest		LOCAL_MODULE:= libmtp

	LOCAL_C_INCLUDES := external/sqlite/dist		LOCAL_C_INCLUDES := external/sqlite/dist

	LOCAL_CFLAGS := -DMTP_DEVICE		LOCAL_CFLAGS := -DMTP_DEVICE -DMTP_HOST

	LOCAL_SHARED_LIBRARIES := libutils libsqlite libstagefright libcutils \		include $(BUILD_STATIC_LIBRARY)
	libmedia

	include $(BUILD_EXECUTABLE)		include $(CLEAR_VARS)

	endif		LOCAL_SRC_FILES:= \
			mtptest.cpp \

	include $(CLEAR_VARS)		LOCAL_MODULE:= mtptest

	LOCAL_MODULE := libmtphost		LOCAL_CFLAGS := -DMTP_DEVICE

	LOCAL_SRC_FILES:= \		LOCAL_SHARED_LIBRARIES := libutils libsqlite libstagefright libcutils \
	MtpClient.cpp \		libmedia
	MtpCursor.cpp \
	MtpDataPacket.cpp \
	MtpDebug.cpp \
	MtpDevice.cpp \
	MtpDeviceInfo.cpp \
	MtpObjectInfo.cpp \
	MtpPacket.cpp \
	MtpProperty.cpp \
	MtpRequestPacket.cpp \
	MtpResponsePacket.cpp \
	MtpStorageInfo.cpp \
	MtpStringBuffer.cpp \
	MtpUtils.cpp \

			LOCAL_STATIC_LIBRARIES := libmtp

	LOCAL_CFLAGS := -g -DMTP_HOST		include $(BUILD_EXECUTABLE)
	LOCAL_LDFLAGS := -g

	include $(BUILD_STATIC_LIBRARY)		endif

	include $(CLEAR_VARS)		include $(CLEAR_VARS)

Original line number	Original line	Diff line number	Diff line
	@@ -128,6 +128,7 @@ extern int register_android_database_SQLiteStatement(JNIEnv* env);
	extern int register_android_debug_JNITest(JNIEnv* env);		extern int register_android_debug_JNITest(JNIEnv* env);
	extern int register_android_media_MtpClient(JNIEnv *env);		extern int register_android_media_MtpClient(JNIEnv *env);
	extern int register_android_media_MtpCursor(JNIEnv *env);		extern int register_android_media_MtpCursor(JNIEnv *env);
			extern int register_android_media_MtpServer(JNIEnv *env);
	extern int register_android_nio_utils(JNIEnv* env);		extern int register_android_nio_utils(JNIEnv* env);
	extern int register_android_pim_EventRecurrence(JNIEnv* env);		extern int register_android_pim_EventRecurrence(JNIEnv* env);
	extern int register_android_text_format_Time(JNIEnv* env);		extern int register_android_text_format_Time(JNIEnv* env);
	@@ -1283,6 +1284,7 @@ static const RegJNIRec gRegJNI[] = {
	REG_JNI(register_android_media_JetPlayer),		REG_JNI(register_android_media_JetPlayer),
	REG_JNI(register_android_media_MtpClient),		REG_JNI(register_android_media_MtpClient),
	REG_JNI(register_android_media_MtpCursor),		REG_JNI(register_android_media_MtpCursor),
			REG_JNI(register_android_media_MtpServer),
	REG_JNI(register_android_media_ToneGenerator),		REG_JNI(register_android_media_ToneGenerator),

	REG_JNI(register_android_opengl_classes),		REG_JNI(register_android_opengl_classes),