summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2012-04-23 14:26:25 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-04-23 14:26:25 -0700
commit9ae1b69fbb336ca67615ed0405197dded6294137 (patch)
tree6985894f4cf64e984441595f9f8539c2e6e92828
parentfd6a5245ccb0294dada070444d9d9c6be752e668 (diff)
parent08f70fa5b82faa00d4d536b5a220d7ce8dd8f932 (diff)
downloadframeworks_base-9ae1b69fbb336ca67615ed0405197dded6294137.zip
frameworks_base-9ae1b69fbb336ca67615ed0405197dded6294137.tar.gz
frameworks_base-9ae1b69fbb336ca67615ed0405197dded6294137.tar.bz2
Merge "Speed up playlist processing"
-rw-r--r--media/java/android/media/MediaScanner.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java
index 26089ad..c41901b 100644
--- a/media/java/android/media/MediaScanner.java
+++ b/media/java/android/media/MediaScanner.java
@@ -1770,8 +1770,10 @@ public class MediaScanner
Iterator<FileEntry> iterator = mPlayLists.iterator();
Cursor fileList = null;
try {
+ // use the files uri and projection because we need the format column,
+ // but restrict the query to just audio files
fileList = mMediaProvider.query(mFilesUri, FILES_PRESCAN_PROJECTION,
- null, null, null, null);
+ "media_type=2", null, null, null);
while (iterator.hasNext()) {
FileEntry entry = iterator.next();
// only process playlist files if they are new or have been modified since the last scan