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

Commit b7e27a65 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Tweaking workaround to use fallback with null buffer" into rvc-dev am: 5be32a1c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12100099

Change-Id: Ice79c30eeb522ff47191feb8d4f1f20c57a6d995
parents af41f0ac 5be32a1c

packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/ThumbnailData.java

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

import android.graphics.Color;

import android.graphics.GraphicBuffer;

import android.graphics.Point;

import android.graphics.Rect;

import android.hardware.HardwareBuffer;

import android.util.Log;
@@ -63,10 +64,12 @@ public class ThumbnailData { 


    public ThumbnailData(TaskSnapshot snapshot) {

        final GraphicBuffer buffer = snapshot.getSnapshot();

        if (buffer != null && (buffer.getUsage() & HardwareBuffer.USAGE_GPU_SAMPLED_IMAGE) == 0) {

        if (buffer == null || (buffer.getUsage() & HardwareBuffer.USAGE_GPU_SAMPLED_IMAGE) == 0) {

            // TODO(b/157562905): Workaround for a crash when we get a snapshot without this state

            Log.e("ThumbnailData", "Unexpected snapshot without USAGE_GPU_SAMPLED_IMAGE");

            thumbnail = Bitmap.createBitmap(buffer.getWidth(), buffer.getHeight(), ARGB_8888);

            Log.e("ThumbnailData", "Unexpected snapshot without USAGE_GPU_SAMPLED_IMAGE: "

                    + buffer);

            Point taskSize = snapshot.getTaskSize();

            thumbnail = Bitmap.createBitmap(taskSize.x, taskSize.y, ARGB_8888);

            thumbnail.eraseColor(Color.BLACK);

        } else {

            thumbnail = Bitmap.wrapHardwareBuffer(buffer, snapshot.getColorSpace());