summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2011-04-25 09:52:26 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-04-25 09:52:26 -0700
commit42f16f3d425df16829d8de4662d97577f421a7ad (patch)
treee33ca226fff9b412162b3c976f0c810d995d8de1 /include
parente8fd99df6e95d4841f987c17ee7f325723d21459 (diff)
parent997354e4b4a9666cedd62282471e97822affced9 (diff)
downloadframeworks_base-42f16f3d425df16829d8de4662d97577f421a7ad.zip
frameworks_base-42f16f3d425df16829d8de4662d97577f421a7ad.tar.gz
frameworks_base-42f16f3d425df16829d8de4662d97577f421a7ad.tar.bz2
Merge "MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider"
Diffstat (limited to 'include')
-rw-r--r--include/media/mediascanner.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/media/mediascanner.h b/include/media/mediascanner.h
index df5be32..765c039 100644
--- a/include/media/mediascanner.h
+++ b/include/media/mediascanner.h
@@ -55,7 +55,7 @@ private:
status_t doProcessDirectory(
char *path, int pathRemaining, MediaScannerClient &client,
- ExceptionCheck exceptionCheck, void *exceptionEnv);
+ bool noMedia, ExceptionCheck exceptionCheck, void *exceptionEnv);
MediaScanner(const MediaScanner &);
MediaScanner &operator=(const MediaScanner &);
@@ -72,10 +72,9 @@ public:
void endFile();
virtual bool scanFile(const char* path, long long lastModified,
- long long fileSize, bool isDirectory) = 0;
+ long long fileSize, bool isDirectory, bool noMedia) = 0;
virtual bool handleStringTag(const char* name, const char* value) = 0;
virtual bool setMimeType(const char* mimeType) = 0;
- virtual bool addNoMediaFolder(const char* path) = 0;
protected:
void convertValues(uint32_t encoding);