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

1 files changed, 12 insertions, 0 deletions

diff --git a/src/com/android/photos/data/PhotoProvider.java b/src/com/android/photos/data/PhotoProvider.java
index cffd1239e..d4310ca95 100644
--- a/src/com/android/photos/data/PhotoProvider.java
+++ b/src/com/android/photos/data/PhotoProvider.java
@@ -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;
+    }
 }