Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
BUG: 3063257

Change-Id: I648ff8c4d4026e3d2a97853257865c9b5f712712
Signed-off-by: Mike Lockwood <lockwood@android.com>
This commit is contained in:
Mike Lockwood
2010-10-07 17:43:57 -04:00
parent d5df1e5cfc
commit 6458935331
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
media/java/android/media/MediaScanner.java
View File

@@ -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) {