commit dc84a61759d87e17e191d9a7a5f3c008d3f62abc
author Ruben Brunk <rubenbrunk@google.com> Tue Apr 23 10:29:25 2013 -0700
committer Ruben Brunk <rubenbrunk@google.com> Tue Apr 23 10:41:30 2013 -0700
tree 062dcbb8d0f4bc97d8aa7022fcb52cf9f9176169
parent 140c263ebb2504fe1a0212a835f0098ce7973a22

Fix to check if crop activity got bad bitmap.

Bug: 8692297
Change-Id: I1900c45c71b3d1c6203e4d25a7ad5354f409fcf2

src/com/android/gallery3d/filtershow/crop/CropActivity.java

diff --git a/src/com/android/gallery3d/filtershow/crop/CropActivity.java b/src/com/android/gallery3d/filtershow/crop/CropActivity.java
index 64d43a2..17b7a4e 100644
--- a/src/com/android/gallery3d/filtershow/crop/CropActivity.java
+++ b/src/com/android/gallery3d/filtershow/crop/CropActivity.java
@@ -269,7 +269,9 @@
         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 @@
                 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,