1 files changed, 3 insertions, 26 deletions

diff --git a/media/jni/android_media_MediaScanner.cpp b/media/jni/android_media_MediaScanner.cpp
index a3dd136..9151799 100644
--- a/media/jni/android_media_MediaScanner.cpp
+++ b/media/jni/android_media_MediaScanner.cpp
@@ -67,7 +67,7 @@ public:
             mScanFileMethodID = env->GetMethodID(
                                     mediaScannerClientInterface,
                                     "scanFile",
-                                    "(Ljava/lang/String;JJZ)V");
+                                    "(Ljava/lang/String;JJZZ)V");
 
             mHandleStringTagMethodID = env->GetMethodID(
                                     mediaScannerClientInterface,
@@ -78,11 +78,6 @@ public:
                                     mediaScannerClientInterface,
                                     "setMimeType",
                                     "(Ljava/lang/String;)V");
-
-            mAddNoMediaFolderMethodID = env->GetMethodID(
-                                    mediaScannerClientInterface,
-                                    "addNoMediaFolder",
-                                    "(Ljava/lang/String;)V");
         }
     }
 
@@ -95,7 +90,7 @@ public:
     // Returns true if it succeeded, false if an exception occured
     // in the Java code
     virtual bool scanFile(const char* path, long long lastModified,
-            long long fileSize, bool isDirectory)
+            long long fileSize, bool isDirectory, bool noMedia)
     {
         LOGV("scanFile: path(%s), time(%lld), size(%lld) and isDir(%d)",
             path, lastModified, fileSize, isDirectory);
@@ -106,7 +101,7 @@ public:
         }
 
         mEnv->CallVoidMethod(mClient, mScanFileMethodID, pathStr, lastModified,
-                fileSize, isDirectory);
+                fileSize, isDirectory, noMedia);
 
         mEnv->DeleteLocalRef(pathStr);
         return (!mEnv->ExceptionCheck());
@@ -149,30 +144,12 @@ public:
         return (!mEnv->ExceptionCheck());
     }
 
-    // Returns true if it succeeded, false if an exception occured
-    // in the Java code
-    virtual bool addNoMediaFolder(const char* path)
-    {
-        LOGV("addNoMediaFolder: path(%s)", path);
-        jstring pathStr;
-        if ((pathStr = mEnv->NewStringUTF(path)) == NULL) {
-            return false;
-        }
-
-        mEnv->CallVoidMethod(mClient, mAddNoMediaFolderMethodID, pathStr);
-
-        mEnv->DeleteLocalRef(pathStr);
-        return (!mEnv->ExceptionCheck());
-    }
-
-
 private:
     JNIEnv *mEnv;
     jobject mClient;
     jmethodID mScanFileMethodID;
     jmethodID mHandleStringTagMethodID;
     jmethodID mSetMimeTypeMethodID;
-    jmethodID mAddNoMediaFolderMethodID;
 };