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

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

Merge "Workaround for crash from invalid snapshot" into rvc-dev am: 10250f67 

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

Change-Id: Ic43c1cb3fd8e57599d394f5c25091c78fd1f92c7
parents f6d8b1cf 10250f67

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

+14 −1
Original line number Diff line number Diff line
@@ -18,12 +18,17 @@ package com.android.systemui.shared.recents.model; 


import static android.app.WindowConfiguration.ROTATION_UNDEFINED;

import static android.content.res.Configuration.ORIENTATION_UNDEFINED;

import static android.graphics.Bitmap.Config.ARGB_8888;



import static com.android.systemui.shared.system.WindowManagerWrapper.WINDOWING_MODE_UNDEFINED;



import android.app.ActivityManager.TaskSnapshot;

import android.graphics.Bitmap;

import android.graphics.Color;

import android.graphics.GraphicBuffer;

import android.graphics.Rect;

import android.hardware.HardwareBuffer;

import android.util.Log;



/**

 * Data for a single thumbnail.
@@ -57,7 +62,15 @@ public class ThumbnailData { 
    }



    public ThumbnailData(TaskSnapshot snapshot) {

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

        final GraphicBuffer buffer = snapshot.getSnapshot();

        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);

            thumbnail.eraseColor(Color.BLACK);

        } else {

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

        }

        insets = new Rect(snapshot.getContentInsets());

        orientation = snapshot.getOrientation();

        rotation = snapshot.getRotation();