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

Commit 47c68f54 authored by Winson Chung's avatar Winson Chung Committed by android-build-merger
Browse files

Merge "Adding additional check for zero-sized snapshot." into oc-dr1-dev 

am: df2a3295

Change-Id: I22d626a3bfc89960271b63eb404dbfbb5456aa0a
parents 8c352f1e df2a3295

services/core/java/com/android/server/wm/TaskSnapshotPersister.java

+10 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.app.ActivityManager.TaskSnapshot; 
import android.graphics.Bitmap;

import android.graphics.Bitmap.CompressFormat;

import android.graphics.Bitmap.Config;

import android.graphics.GraphicBuffer;

import android.os.Process;

import android.os.SystemClock;

import android.util.ArraySet;
@@ -325,6 +326,15 @@ class TaskSnapshotPersister { 
            final File file = getBitmapFile(mTaskId, mUserId);

            final File reducedFile = getReducedResolutionBitmapFile(mTaskId, mUserId);

            final Bitmap bitmap = Bitmap.createHardwareBitmap(mSnapshot.getSnapshot());

            if (bitmap == null) {

                Slog.e(TAG, "Invalid task snapshot");

                return false;

            } else if (bitmap.getWidth() == 0 || bitmap.getHeight() == 0) {

                Slog.e(TAG, "Invalid task snapshot dimensions " + bitmap.getWidth() + "x"

                        + bitmap.getHeight());

                return false;

            }



            final Bitmap swBitmap = bitmap.copy(Config.ARGB_8888, false /* isMutable */);

            final Bitmap reduced = Bitmap.createScaledBitmap(swBitmap,

                    (int) (bitmap.getWidth() * REDUCED_SCALE),