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

Commit 34a50f0c authored by George Mount's avatar George Mount Committed by Android (Google) Code Review
Browse files

Merge "Add _COUNT support for PhotoProvider to help performance of All... 

Merge "Add _COUNT support for PhotoProvider to help performance of All Photos." into gb-ub-photos-bryce
parents ea2fa83c ba1d7caf

src/com/android/photos/data/PhotoProvider.java

+12 −0
Original line number Diff line number Diff line
@@ -226,6 +226,9 @@ public class PhotoProvider extends SQLiteContentProvider { 
    protected static final String IN = " IN ";

    protected static final String NESTED_SELECT_START = "(";

    protected static final String NESTED_SELECT_END = ")";

    protected static final String[] PROJECTION_COUNT = {

        "COUNT(*)"

    };



    /**

     * For selecting the mime-type for an image.
@@ -310,6 +313,7 @@ public class PhotoProvider extends SQLiteContentProvider { 
    @Override

    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,

            String sortOrder, CancellationSignal cancellationSignal) {

        projection = replaceCount(projection);

        int match = matchUri(uri);

        selection = addIdToSelection(match, selection);

        selectionArgs = addIdToSelectionArgs(match, uri, selectionArgs);
@@ -521,4 +525,12 @@ public class PhotoProvider extends SQLiteContentProvider { 
            return db.query(table, columns, selection, selectionArgs, null, null, orderBy);

        }

    }



    protected static String[] replaceCount(String[] projection) {

        if (projection != null && projection.length == 1

                && BaseColumns._COUNT.equals(projection[0])) {

            return PROJECTION_COUNT;

        }

        return projection;

    }

}