Merge "Remove MTP related log spam" into honeycomb

2 files changed, 0 insertions, 21 deletions

diff --git a/media/jni/android_mtp_MtpDatabase.cpp b/media/jni/android_mtp_MtpDatabase.cpp
index 9abf6a2..17d39e3 100644
--- a/media/jni/android_mtp_MtpDatabase.cpp
+++ b/media/jni/android_mtp_MtpDatabase.cpp
@@ -1031,7 +1031,6 @@ static void
 android_mtp_MtpDatabase_setup(JNIEnv *env, jobject thiz)
 {
 #ifdef HAVE_ANDROID_OS
-    LOGD("setup\n");
     MyMtpDatabase* database = new MyMtpDatabase(env, thiz);
     env->SetIntField(thiz, field_context, (int)database);
     checkAndClearExceptionFromCallback(env, __FUNCTION__);
@@ -1042,7 +1041,6 @@ static void
 android_mtp_MtpDatabase_finalize(JNIEnv *env, jobject thiz)
 {
 #ifdef HAVE_ANDROID_OS
-    LOGD("finalize\n");
     MyMtpDatabase* database = (MyMtpDatabase *)env->GetIntField(thiz, field_context);
     database->cleanup(env);
     delete database;
@@ -1081,8 +1079,6 @@ int register_android_mtp_MtpDatabase(JNIEnv *env)
 {
     jclass clazz;
 
-    LOGD("register_android_mtp_MtpDatabase\n");
-
     clazz = env->FindClass("android/mtp/MtpDatabase");
     if (clazz == NULL) {
         LOGE("Can't find android/mtp/MtpDatabase");
diff --git a/media/jni/android_mtp_MtpServer.cpp b/media/jni/android_mtp_MtpServer.cpp
index 8908e67..1452d21 100644
--- a/media/jni/android_mtp_MtpServer.cpp
+++ b/media/jni/android_mtp_MtpServer.cpp
@@ -111,7 +111,6 @@ public:
 
             sMutex.unlock();
 
-            LOGD("MtpThread mServer->run");
             mServer->run();
             sleep(1);
 
@@ -128,7 +127,6 @@ public:
         env->DeleteGlobalRef(mJavaServer);
         sMutex.unlock();
 
-        LOGD("threadLoop returning");
         return false;
     }
 
@@ -160,8 +158,6 @@ android_mtp_MtpServer_setup(JNIEnv *env, jobject thiz, jobject javaDatabase,
         jstring storagePath, jlong reserveSpace)
 {
 #ifdef HAVE_ANDROID_OS
-    LOGD("setup\n");
-
     MtpDatabase* database = getMtpDatabase(env, javaDatabase);
     const char *storagePathStr = env->GetStringUTFChars(storagePath, NULL);
 
@@ -174,17 +170,9 @@ android_mtp_MtpServer_setup(JNIEnv *env, jobject thiz, jobject javaDatabase,
 }
 
 static void
-android_mtp_MtpServer_finalize(JNIEnv *env, jobject thiz)
-{
-    LOGD("finalize\n");
-}
-
-
-static void
 android_mtp_MtpServer_start(JNIEnv *env, jobject thiz)
 {
 #ifdef HAVE_ANDROID_OS
-    LOGD("start\n");
     MtpThread *thread = (MtpThread *)env->GetIntField(thiz, field_context);
     thread->run("MtpThread");
 #endif // HAVE_ANDROID_OS
@@ -194,7 +182,6 @@ static void
 android_mtp_MtpServer_stop(JNIEnv *env, jobject thiz)
 {
 #ifdef HAVE_ANDROID_OS
-    LOGD("stop\n");
     MtpThread *thread = (MtpThread *)env->GetIntField(thiz, field_context);
     if (thread)
         thread->stop();
@@ -225,7 +212,6 @@ static void
 android_mtp_MtpServer_set_ptp_mode(JNIEnv *env, jobject thiz, jboolean usePtp)
 {
 #ifdef HAVE_ANDROID_OS
-    LOGD("set_ptp_mode\n");
     MtpThread *thread = (MtpThread *)env->GetIntField(thiz, field_context);
     if (thread)
         thread->setPtpMode(usePtp);
@@ -237,7 +223,6 @@ android_mtp_MtpServer_set_ptp_mode(JNIEnv *env, jobject thiz, jboolean usePtp)
 static JNINativeMethod gMethods[] = {
     {"native_setup",                "(Landroid/mtp/MtpDatabase;Ljava/lang/String;J)V",
                                             (void *)android_mtp_MtpServer_setup},
-    {"native_finalize",             "()V",  (void *)android_mtp_MtpServer_finalize},
     {"native_start",                "()V",  (void *)android_mtp_MtpServer_start},
     {"native_stop",                 "()V",  (void *)android_mtp_MtpServer_stop},
     {"native_send_object_added",    "(I)V", (void *)android_mtp_MtpServer_send_object_added},
@@ -251,8 +236,6 @@ int register_android_mtp_MtpServer(JNIEnv *env)
 {
     jclass clazz;
 
-    LOGD("register_android_mtp_MtpServer\n");
-
     clazz = env->FindClass("android/mtp/MtpServer");
     if (clazz == NULL) {
         LOGE("Can't find android/mtp/MtpServer");