Fix NPE in Gallery.

This happens if user set type in an intent. But we get a different type from
content resolver.

Change-Id: Iabafce7f7aaff23a7a9ee09e1d38ab50049abc88
fix: 6358473

1 files changed, 2 insertions, 2 deletions

diff --git a/src/com/android/gallery3d/data/DataManager.java b/src/com/android/gallery3d/data/DataManager.java
index 1da3b76ca..0eb6af55e 100644
--- a/src/com/android/gallery3d/data/DataManager.java
+++ b/src/com/android/gallery3d/data/DataManager.java
@@ -242,10 +242,10 @@ public class DataManager {
         return getMediaObject(path).getMediaType();
     }
 
-    public Path findPathByUri(Uri uri) {
+    public Path findPathByUri(Uri uri, String type) {
         if (uri == null) return null;
         for (MediaSource source : mSourceMap.values()) {
-            Path path = source.findPathByUri(uri);
+            Path path = source.findPathByUri(uri, type);
             if (path != null) return path;
         }
         return null;