summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2012-02-02 10:48:01 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-02-02 10:48:01 -0800
commit8ca8a69d5801ad4b809e7b9dbf53bd728820924b (patch)
tree16015f6738690af5d576c075b95a26408a92c9e2 /media
parent659793bcd0e0d08306d841f3836a891e56e4e756 (diff)
parentd6b3e0cc36cbe28c8d194b63227df37c76af7efa (diff)
downloadframeworks_base-8ca8a69d5801ad4b809e7b9dbf53bd728820924b.zip
frameworks_base-8ca8a69d5801ad4b809e7b9dbf53bd728820924b.tar.gz
frameworks_base-8ca8a69d5801ad4b809e7b9dbf53bd728820924b.tar.bz2
Merge "Enable media scanner bulk inserts"
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/MediaScanner.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java
index b640e9a..1c13fff 100644
--- a/media/java/android/media/MediaScanner.java
+++ b/media/java/android/media/MediaScanner.java
@@ -314,10 +314,8 @@ public class MediaScanner
private final String mExternalStoragePath;
- // WARNING: Bulk inserts sounded like a great idea and gave us a good performance improvement,
- // but unfortunately it also introduced a number of bugs. All the known bugs were fixed,
- // but we need more testing before enabling.
- private static final boolean ENABLE_BULK_INSERTS = false;
+ /** whether to use bulk inserts or individual inserts for each item */
+ private static final boolean ENABLE_BULK_INSERTS = true;
// used when scanning the image database so we know whether we have to prune
// old thumbnail files