diff options
| author | Owen Lin <owenlin@google.com> | 2012-04-20 18:42:22 +0800 |
|---|---|---|
| committer | Owen Lin <owenlin@google.com> | 2012-04-25 15:27:42 +0800 |
| commit | 21a412c93c9b0401b039f4eb86d4950752e5bb84 (patch) | |
| tree | eaf079fb8ef3df692c9f462816aea15b81285e80 /src/com/android/gallery3d/data/LocalSource.java | |
| parent | 714fe2055eed029fa2a622f2e2504524f4881ba2 (diff) | |
| download | android_packages_apps_Gallery2-21a412c93c9b0401b039f4eb86d4950752e5bb84.tar.gz android_packages_apps_Gallery2-21a412c93c9b0401b039f4eb86d4950752e5bb84.tar.bz2 android_packages_apps_Gallery2-21a412c93c9b0401b039f4eb86d4950752e5bb84.zip | |
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
Diffstat (limited to 'src/com/android/gallery3d/data/LocalSource.java')
| -rw-r--r-- | src/com/android/gallery3d/data/LocalSource.java | 2 |
1 files changed, 1 insertions, 1 deletions
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: { |