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

Commit 9c173dbc authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Fix 3309250: Don't crash when thumbnail is null"

parents 78526012 25eef890

packages/SystemUI/src/com/android/systemui/statusbar/tablet/RecentAppsPanel.java

+17 −14
Original line number Diff line number Diff line
@@ -257,6 +257,7 @@ public class RecentAppsPanel extends LinearLayout implements StatusBarPanel, OnC 


    private Bitmap compositeBitmap(Bitmap background, Bitmap thumbnail) {

        Bitmap outBitmap = background.copy(background.getConfig(), true);

        if (thumbnail != null) {

            Canvas canvas = new Canvas(outBitmap);

            Paint paint = new Paint();

            paint.setAntiAlias(true);
@@ -264,13 +265,15 @@ public class RecentAppsPanel extends LinearLayout implements StatusBarPanel, OnC 
            paint.setAlpha(255);

            final int srcWidth = thumbnail.getWidth();

            final int height = thumbnail.getHeight();

        final int srcHeight = srcWidth > height ? height : (height - height * srcWidth / height);

            final int srcHeight = srcWidth > height ? height

                    : (height - height * srcWidth / height);

            canvas.drawBitmap(thumbnail,

                    new Rect(0, 0, srcWidth-1, srcHeight-1),

                    new RectF(GLOW_PADDING,

                            GLOW_PADDING - 4.0f,

                            outBitmap.getWidth() - GLOW_PADDING + 2.0f,

                            outBitmap.getHeight() - GLOW_PADDING + 3.0f), paint);

        }

        return outBitmap;

    }