Return early when we cannot allocate a hardware layer
Bug #5462308
Change-Id: I52dab809662f6f42a49ca03edc50f6b98fc35a06
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 86be28a..4385d5a 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -10092,8 +10092,20 @@
mLocalDirtyRect.setEmpty();
}
+ // The layer is not valid if the underlying GPU resources cannot be allocated
+ if (!mHardwareLayer.isValid()) {
+ return null;
+ }
+
HardwareCanvas currentCanvas = mAttachInfo.mHardwareCanvas;
final HardwareCanvas canvas = mHardwareLayer.start(currentCanvas);
+
+ // Make sure all the GPU resources have been properly allocated
+ if (canvas == null) {
+ mHardwareLayer.end(currentCanvas);
+ return null;
+ }
+
mAttachInfo.mHardwareCanvas = canvas;
try {
canvas.setViewport(width, height);