Merge "Make sure we check for valid GrContext when pinning images." into sc-dev

2021-07-01 01:59:40 +00:00
parent 7c8167b0f2 f8cb525497
commit 351080a8f5
1 changed files with 4 additions and 0 deletions
--- a/libs/hwui/pipeline/skia/SkiaPipeline.cpp
+++ b/libs/hwui/pipeline/skia/SkiaPipeline.cpp
@@ -59,6 +59,10 @@ void SkiaPipeline::onDestroyHardwareResources() {
 }

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