Merge "MediaScanner: don't call pruneDeadThumbnailFiles unless the images table is empty"

1 files changed, 12 insertions, 0 deletions

diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java
index bc5f9fa..e5fa0f8 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) {