From 56363ddedc94981a0745065d792603bbf7d23878 Mon Sep 17 00:00:00 2001 From: Owen Lin Date: Fri, 20 Apr 2012 18:42:22 +0800 Subject: 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 --- src/com/android/gallery3d/data/LocalSource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/com/android/gallery3d/data/LocalSource.java') diff --git a/src/com/android/gallery3d/data/LocalSource.java b/src/com/android/gallery3d/data/LocalSource.java index 19b2fec4f..6735b16e4 100644 --- a/src/com/android/gallery3d/data/LocalSource.java +++ b/src/com/android/gallery3d/data/LocalSource.java @@ -151,7 +151,7 @@ class LocalSource extends MediaSource { } @Override - public Path findPathByUri(Uri uri) { + public Path findPathByUri(Uri uri, String type) { try { switch (mUriMatcher.match(uri)) { case LOCAL_IMAGE_ITEM: { -- cgit v1.2.3