From 6458935331ccfacb4cccc50d6b893947febae687 Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Thu, 7 Oct 2010 17:43:57 -0400 Subject: [PATCH] MediaScanner: don't call pruneDeadThumbnailFiles unless the images table is empty BUG: 3063257 Change-Id: I648ff8c4d4026e3d2a97853257865c9b5f712712 Signed-off-by: Mike Lockwood --- media/java/android/media/MediaScanner.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java index bc5f9fa2490df..e5fa0f823a2f6 100644 --- a/media/java/android/media/MediaScanner.java +++ b/media/java/android/media/MediaScanner.java @@ -117,6 +117,10 @@ public class MediaScanner Files.FileColumns.DATE_MODIFIED, // 3 }; + private static final String[] ID_PROJECTION = new String[] { + Files.FileColumns._ID, + }; + private static final int FILES_PRESCAN_ID_COLUMN_INDEX = 0; private static final int FILES_PRESCAN_PATH_COLUMN_INDEX = 1; private static final int FILES_PRESCAN_FORMAT_COLUMN_INDEX = 2; @@ -933,6 +937,14 @@ public class MediaScanner c.close(); } } + + // compute original size of images + mOriginalCount = 0; + c = mMediaProvider.query(mImagesUri, ID_PROJECTION, null, null, null); + if (c != null) { + mOriginalCount = c.getCount(); + c.close(); + } } private boolean inScanDirectory(String path, String[] directories) {