Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d815c49 authored by kaiyiz's avatar kaiyiz Committed by Gerrit - the friendly Code Review server
Browse files

WallpaperCropper: Fix crash when set .gif as wallpaper 

It returns an equivalent scaled cropBounds as true
crop bounds, then it set the rounded rect by rounding
"out" the true crop rect, this make the rounded crop
rect may out range of the original bitmap, then an error
will happen.

We change to check the rounded crop rect, if it is out
the range of original bitmap, we set the original bitmap
bounds as rounded crop bounds.

CRs-Fixed: 622582

Change-Id: I215ef2a0165adaaadb05c62dee741a8ea6926144
parent bfe13dfb

packages/WallpaperCropper/src/com/android/wallpapercropper/WallpaperCropActivity.java

+8 −0
Original line number Diff line number Diff line
@@ -634,6 +634,14 @@ public class WallpaperCropActivity extends Activity { 
                        mCropBounds.bottom /= scaleDownSampleSize;

                        mCropBounds.right /= scaleDownSampleSize;

                        mCropBounds.roundOut(roundedTrueCrop);

                        if (roundedTrueCrop.right > mCropBounds.right) {

                            roundedTrueCrop.set(roundedTrueCrop.left, roundedTrueCrop.top,

                                    (int) mCropBounds.right, roundedTrueCrop.bottom);

                        }

                        if (roundedTrueCrop.bottom > mCropBounds.bottom) {

                            roundedTrueCrop.set(roundedTrueCrop.left, roundedTrueCrop.top,

                                    roundedTrueCrop.right, (int) mCropBounds.bottom);

                        }



                        crop = Bitmap.createBitmap(fullSize, roundedTrueCrop.left,

                                roundedTrueCrop.top, roundedTrueCrop.width(),