diff options
author | nicolasroard <nicolasroard@google.com> | 2013-02-12 13:41:30 -0800 |
---|---|---|
committer | nicolasroard <nicolasroard@google.com> | 2013-02-12 13:41:30 -0800 |
commit | a0d689f180db4c995d5be39a326b1fb5b21ff5c0 (patch) | |
tree | 7d9946efd49f0dcea7b46ae8cefdbcf64b7140ae /src/com/android/gallery3d/filtershow | |
parent | 80149cd62b58b32d5247eb76a6f9e1f3427549d6 (diff) | |
download | android_packages_apps_Gallery2-a0d689f180db4c995d5be39a326b1fb5b21ff5c0.tar.gz android_packages_apps_Gallery2-a0d689f180db4c995d5be39a326b1fb5b21ff5c0.tar.bz2 android_packages_apps_Gallery2-a0d689f180db4c995d5be39a326b1fb5b21ff5c0.zip |
Add null check on the source URI
bug:8181133
Change-Id: I1a7226db3ceb42a759f24c9b70f140a63a4294f0
Diffstat (limited to 'src/com/android/gallery3d/filtershow')
-rw-r--r-- | src/com/android/gallery3d/filtershow/cache/ImageLoader.java | 2 | ||||
-rw-r--r-- | src/com/android/gallery3d/filtershow/tools/SaveCopyTask.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java index 4ec6abddb..00fcf4e19 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]; |