Camera2: fix preview thumb could not update after delete photo

The preview thumb bitmap is still exist after restart Camera even if
some photo in phone is changed.

Clear preview thumb bitmap when resume camera activity.

CRs-Fixed: 768224

Change-Id: I3d0713a38d92d7d28a73f833df6d7e8e53faa23c

1 files changed, 5 insertions, 2 deletions

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index b5fc0a676..3c4a93a18 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -621,8 +621,10 @@ public class CameraActivity extends Activity
         if (cursor == null)
             return null;
         int column_index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
-        cursor.moveToFirst();
-        String s = cursor.getString(column_index);
+        String s = null;
+        if (cursor.moveToFirst()) {
+            s = cursor.getString(column_index);
+        }
         cursor.close();
         return s;
     }
@@ -1418,6 +1420,7 @@ public class CameraActivity extends Activity
                 // If it's secure camera, requestLoad() should not be called
                 // as it will load all the data.
                 mDataAdapter.requestLoad(getContentResolver());
+                setPreviewThumbnailBitmap(null);
             }
         }
         mLocalImagesObserver.setActivityPaused(false);