Gallery2: fix the bug that only delete parts of photos when select all.

DataManager.getMediaObject() may return null value, so DataManager.delete()
and DataManager.getSupportedOperations() will be interrupted
and only parts of photos were deleted.

Add null value check, ensure the DataManager.delete() and
DataManager.getSupportedOperations() can execute normally.

Change-Id: If5a4f1118d9a03d9d70c2e237347d20b3142b031
CRs-Fixed: 954040

1 files changed, 10 insertions, 2 deletions

diff --git a/src/com/android/gallery3d/data/DataManager.java b/src/com/android/gallery3d/data/DataManager.java
index 38865e9f1..5c7664cb9 100644
--- a/src/com/android/gallery3d/data/DataManager.java
+++ b/src/com/android/gallery3d/data/DataManager.java
@@ -242,7 +242,12 @@ public class DataManager implements StitchingChangeListener {
 
     // The following methods forward the request to the proper object.
     public int getSupportedOperations(Path path) {
-        return getMediaObject(path).getSupportedOperations();
+        int support = 0;
+        MediaObject mediaObject = getMediaObject(path);
+        if (mediaObject != null) {
+            support = mediaObject.getSupportedOperations();
+        }
+        return support;
     }
 
     public void getPanoramaSupport(Path path, PanoramaSupportCallback callback) {
@@ -250,7 +255,10 @@ public class DataManager implements StitchingChangeListener {
     }
 
     public void delete(Path path) {
-        getMediaObject(path).delete();
+        MediaObject mediaObject = getMediaObject(path);
+        if (mediaObject != null) {
+            mediaObject.delete();
+        }
     }
 
     public void rotate(Path path, int degrees) {