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 | 0e1fd65c1b797dbed03570bf5e4f868600d680c3 (patch) | |
| tree | 96783acecf2e9ffc90d85d128a441e203512a79b /src | |
| parent | 1c00e97c214dc8c0a73f02b9faec53ce02d81b54 (diff) | |
| download | android_packages_apps_Snap-0e1fd65c1b797dbed03570bf5e4f868600d680c3.tar.gz android_packages_apps_Snap-0e1fd65c1b797dbed03570bf5e4f868600d680c3.tar.bz2 android_packages_apps_Snap-0e1fd65c1b797dbed03570bf5e4f868600d680c3.zip | |
Add null check on the source URI
bug:8181133
Change-Id: I1a7226db3ceb42a759f24c9b70f140a63a4294f0
Diffstat (limited to 'src')
| -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]; |