Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64589353 authored by Mike Lockwood's avatar Mike Lockwood
Browse files

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



BUG: 3063257

Change-Id: I648ff8c4d4026e3d2a97853257865c9b5f712712
Signed-off-by: default avatarMike Lockwood <lockwood@android.com>
parent d5df1e5c

media/java/android/media/MediaScanner.java

+12 −0
Original line number Diff line number Diff line
@@ -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) {