commit f8cb525497441600796d8a9cfcea0fb7908503cc
author Greg Daniel <egdaniel@google.com> Wed Jun 30 10:40:34 2021 -0400
committer Greg Daniel <egdaniel@google.com> Wed Jun 30 12:06:53 2021 -0400
tree a42351c3912db5852aa3386f2f2399c6f74a333d
parent 69a09397647eabe8cab888186963560726f984ad

Make sure we check for valid GrContext when pinning images.

Test: manual building and running.
Bug: 187540936
Change-Id: Ie900d80128646c8ca2d4fce41d436019e3cf9c71

libs/hwui/pipeline/skia/SkiaPipeline.cpp

diff --git a/libs/hwui/pipeline/skia/SkiaPipeline.cpp b/libs/hwui/pipeline/skia/SkiaPipeline.cpp
index 5462623..44a6e43 100644
--- a/libs/hwui/pipeline/skia/SkiaPipeline.cpp
+++ b/libs/hwui/pipeline/skia/SkiaPipeline.cpp
@@ -59,6 +59,10 @@
 }
 
 bool SkiaPipeline::pinImages(std::vector<SkImage*>& mutableImages) {
+    if (!mRenderThread.getGrContext()) {
+        ALOGD("Trying to pin an image with an invalid GrContext");
+        return false;
+    }
     for (SkImage* image : mutableImages) {
         if (SkImage_pinAsTexture(image, mRenderThread.getGrContext())) {
             mPinnedImages.emplace_back(sk_ref_sp(image));