Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Workaround for crash from invalid snapshot" into rvc-dev

Browse Source
This commit is contained in:
Winson Chung
2020-06-18 17:56:24 +00:00
committed by Android (Google) Code Review
parent 254dcfd5f4 c8ba260b4d
commit 10250f67f1
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,12 +18,17 @@ package com.android.systemui.shared.recents.model;
import static android.app.WindowConfiguration.ROTATION_UNDEFINED; import static android.app.WindowConfiguration.ROTATION_UNDEFINED;
import static android.content.res.Configuration.ORIENTATION_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 static com.android.systemui.shared.system.WindowManagerWrapper.WINDOWING_MODE_UNDEFINED;
import android.app.ActivityManager.TaskSnapshot; import android.app.ActivityManager.TaskSnapshot;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.Color;
import android.graphics.GraphicBuffer;
import android.graphics.Rect; import android.graphics.Rect;
import android.hardware.HardwareBuffer;
import android.util.Log;
/** /**
* Data for a single thumbnail. * Data for a single thumbnail.
@@ -57,7 +62,15 @@ public class ThumbnailData {
} }
public ThumbnailData(TaskSnapshot snapshot) { 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()); insets = new Rect(snapshot.getContentInsets());
orientation = snapshot.getOrientation(); orientation = snapshot.getOrientation();
rotation = snapshot.getRotation(); rotation = snapshot.getRotation();