diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2013-04-23 10:29:25 -0700 |
|---|---|---|
| committer | Ruben Brunk <rubenbrunk@google.com> | 2013-04-23 10:41:30 -0700 |
| commit | dc84a61759d87e17e191d9a7a5f3c008d3f62abc (patch) | |
| tree | 062dcbb8d0f4bc97d8aa7022fcb52cf9f9176169 /src/com/android/gallery3d/filtershow/crop | |
| parent | 140c263ebb2504fe1a0212a835f0098ce7973a22 (diff) | |
| download | android_packages_apps_Snap-dc84a61759d87e17e191d9a7a5f3c008d3f62abc.tar.gz android_packages_apps_Snap-dc84a61759d87e17e191d9a7a5f3c008d3f62abc.tar.bz2 android_packages_apps_Snap-dc84a61759d87e17e191d9a7a5f3c008d3f62abc.zip | |
Fix to check if crop activity got bad bitmap.
Bug: 8692297
Change-Id: I1900c45c71b3d1c6203e4d25a7ad5354f409fcf2
Diffstat (limited to 'src/com/android/gallery3d/filtershow/crop')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/crop/CropActivity.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/filtershow/crop/CropActivity.java b/src/com/android/gallery3d/filtershow/crop/CropActivity.java index 64d43a2f7..17b7a4e6d 100644 --- a/src/com/android/gallery3d/filtershow/crop/CropActivity.java +++ b/src/com/android/gallery3d/filtershow/crop/CropActivity.java @@ -269,7 +269,9 @@ public class CropActivity extends Activity { if (mOriginalBitmap != null && mCropExtras != null) { if (mCropExtras.getExtraOutput() != null) { destinationUri = mCropExtras.getExtraOutput(); - flags |= DO_EXTRA_OUTPUT; + if (destinationUri != null) { + flags |= DO_EXTRA_OUTPUT; + } } if (mCropExtras.getSetAsWallpaper()) { flags |= DO_SET_WALLPAPER; @@ -284,7 +286,7 @@ public class CropActivity extends Activity { flags |= DO_EXTRA_OUTPUT; } } - if ((flags & FLAG_CHECK) != 0) { + if ((flags & FLAG_CHECK) != 0 && mOriginalBitmap != null) { RectF photo = new RectF(0, 0, mOriginalBitmap.getWidth(), mOriginalBitmap.getHeight()); RectF crop = getBitmapCrop(photo); startBitmapIO(flags, mOriginalBitmap, mSourceUri, destinationUri, crop, |