From: nicolasroard <nicolasroard@google.com>
Date: Tue, 12 Feb 2013 21:41:30 +0000 (-0800)
Subject: Add null check on the source URI
X-Git-Tag: android-x86-7.1-r1~64^2~10^2~537^2^2^2^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c4082ca0b8df81d093b6cc0a99254b56d97532c3;p=android-x86%2Fpackages-apps-Gallery2.git

Add null check on the source URI

bug:8181133
Change-Id: I1a7226db3ceb42a759f24c9b70f140a63a4294f0
---

diff --git a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
index b47d13b9e..ebc7cfc24 100644
--- a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
+++ b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
@@ -448,7 +448,7 @@ public class ImageLoader {
 
             @Override
             public Bitmap onExecute(ImagePreset param) {
-                if (param == null) {
+                if (param == null || mUri == null) {
                     return null;
                 }
                 Bitmap bitmap = loadMutableBitmap(mContext, mUri);
diff --git a/src/com/android/gallery3d/filtershow/tools/SaveCopyTask.java b/src/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
index 38a9a3a2f..e378fe2b7 100644
--- a/src/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
+++ b/src/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
@@ -168,7 +168,7 @@ public class SaveCopyTask extends AsyncTask<ImagePreset, Void, Uri> {
     @Override
     protected Uri doInBackground(ImagePreset... params) {
         // TODO: Support larger dimensions for photo saving.
-        if (params[0] == null) {
+        if (params[0] == null || sourceUri == null) {
             return null;
         }
         ImagePreset preset = params[0];