AOSP/Camera2 - Fix bug causing edit, share, delete buttons to not appear

The edit, share and delete buttons were not showing up on the images in
the filmstrip view. This was caused by the recent storage API changes
causing the images to be not found at the same path as before.

Test: manual, ensured the Camera2 app UI functioned correctly and the
buttons appear as desired in the filmstrip view.

BUG: 163082488
Change-Id: I3e99c982c733e48c63457ffe9c21b259ef53bb3f

2 files changed, 4 insertions, 5 deletions

diff --git a/src/com/android/camera/data/FilmstripContentQueries.java b/src/com/android/camera/data/FilmstripContentQueries.java
index 2aba065f3..4b607d40a 100644
--- a/src/com/android/camera/data/FilmstripContentQueries.java
+++ b/src/com/android/camera/data/FilmstripContentQueries.java
@@ -32,7 +32,6 @@ import java.util.List;
  */
 public class FilmstripContentQueries {
     private static final Log.Tag TAG = new Log.Tag("LocalDataQuery");
-    private static final String SELECT_BY_PATH = MediaStore.MediaColumns.DATA + " LIKE ?";
 
     public interface CursorToFilmstripItemFactory<I extends FilmstripItem> {
 
@@ -60,9 +59,8 @@ public class FilmstripContentQueries {
     public static <I extends FilmstripItem> List<I> forCameraPath(ContentResolver contentResolver,
           Uri contentUri, String[] projection, long minimumId, String orderBy,
           CursorToFilmstripItemFactory<I> factory) {
-        String selection = SELECT_BY_PATH + " AND " + MediaStore.MediaColumns._ID + " > ?";
-        String cameraPath = Storage.instance().DIRECTORY + "%";
-        String[] selectionArgs = new String[] { cameraPath, Long.toString(minimumId) };
+        String selection = MediaStore.MediaColumns._ID + " > ?";
+        String[] selectionArgs = new String[] { Long.toString(minimumId) };
 
         Cursor cursor = contentResolver.query(contentUri, projection,
               selection, selectionArgs, orderBy);
diff --git a/src/com/android/camera/data/FilmstripItemBase.java b/src/com/android/camera/data/FilmstripItemBase.java
index e3c589f99..1cc73c47b 100644
--- a/src/com/android/camera/data/FilmstripItemBase.java
+++ b/src/com/android/camera/data/FilmstripItemBase.java
@@ -141,7 +141,8 @@ public abstract class FilmstripItemBase<T extends FilmstripItemData> implements
 
     private void deleteIfEmptyCameraSubDir(File directory) {
         // Make sure 'directory' refers to a valid existing empty directory.
-        if (!directory.exists() || !directory.isDirectory() || directory.list().length != 0) {
+        if (!directory.exists() || !directory.isDirectory()
+                || directory.list() == null || directory.list().length != 0) {
             return;
         }