Fix NPE in Gallery.

[android-x86/packages-apps-Gallery2.git] / src / com / android / gallery3d / app / CropImage.java

diff --git a/src/com/android/gallery3d/app/CropImage.java b/src/com/android/gallery3d/app/CropImage.java
index 7e1572f..40b357d 100644 (file)
--- a/src/com/android/gallery3d/app/CropImage.java
+++ b/src/com/android/gallery3d/app/CropImage.java
@@ -887,13 +887,9 @@ public class CropImage extends AbstractGalleryActivity {
     private MediaItem getMediaItemFromIntentData() {
         Uri uri = getIntent().getData();
         DataManager manager = getDataManager();
-        if (uri == null) {
-            Log.w(TAG, "no data given");
-            return null;
-        }
-        Path path = manager.findPathByUri(uri);
+        Path path = manager.findPathByUri(uri, getIntent().getType());
         if (path == null) {
-            Log.w(TAG, "cannot get path for: " + uri);
+            Log.w(TAG, "cannot get path for: " + uri + ", or no data given");
             return null;
         }
         return (MediaItem) manager.getMediaObject(path);