Merge SP1A.210412.001

Change-Id: I0e1c2f5679d5f721cd605b7da785959763311698

1 files changed, 6 insertions, 0 deletions

diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp
index 800c58095041..aedb5c28dc3e 100644
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -452,6 +452,12 @@ void CanvasContext::notifyFramePending() {
 }
 
 void CanvasContext::draw() {
+    if (auto grContext = getGrContext()) {
+        if (grContext->abandoned()) {
+            LOG_ALWAYS_FATAL("GrContext is abandoned/device lost at start of CanvasContext::draw");
+            return;
+        }
+    }
     SkRect dirty;
     mDamageAccumulator.finish(&dirty);