Gallery2: catch OOM error when crop big-size picture

An OOM error happened when set big size of picture as wallpaper

We catch the OOM error, and if fail to crop the picture, we
show a toast.

CRs-Fixed: 522476

Change-Id: Ia9d7f41ca768c9183b26051fb08c9f823fec0074

1 files changed, 9 insertions, 3 deletions

diff --git a/src/com/android/gallery3d/filtershow/crop/CropActivity.java b/src/com/android/gallery3d/filtershow/crop/CropActivity.java
index 3a7829681..9a0167a4f 100644
--- a/src/com/android/gallery3d/filtershow/crop/CropActivity.java
+++ b/src/com/android/gallery3d/filtershow/crop/CropActivity.java
@@ -347,6 +347,8 @@ public class CropActivity extends Activity {
         if (success) {
             setResult(RESULT_OK, intent);
         } else {
+            Toast.makeText(CropActivity.this, R.string.save_error,
+                    Toast.LENGTH_LONG).show();
             setResult(RESULT_CANCELED, intent);
         }
         done();
@@ -502,9 +504,13 @@ public class CropActivity extends Activity {
                         fullSize = BitmapFactory.decodeStream(mInStream);
                     }
                     if (fullSize != null) {
-                        crop = Bitmap.createBitmap(fullSize, roundedTrueCrop.left,
-                                roundedTrueCrop.top, roundedTrueCrop.width(),
-                                roundedTrueCrop.height());
+                        try {
+                            crop = Bitmap.createBitmap(fullSize, roundedTrueCrop.left,
+                                    roundedTrueCrop.top, roundedTrueCrop.width(),
+                                    roundedTrueCrop.height());
+                        } catch (java.lang.OutOfMemoryError err) {
+                            Log.e(LOGTAG, "failed to create bitmap:" + err );
+                        }
                     }
                 }