From 89cd62c8f31d2029263f41d050cf806bfb9935f5 Mon Sep 17 00:00:00 2001
From: Chris Craik <ccraik@google.com>
Date: Fri, 22 Sep 2017 09:31:05 -0700
Subject: Speculative fix for missing target crash

Bug: 66451158
Test: manual app usage

Change-Id: I2db3aa73edcb80da25ead64205011705f0beef91
---
 libs/hwui/OpenGLReadback.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'libs/hwui/OpenGLReadback.cpp')

diff --git a/libs/hwui/OpenGLReadback.cpp b/libs/hwui/OpenGLReadback.cpp
index 025503b15975..5c4263e03abc 100644
--- a/libs/hwui/OpenGLReadback.cpp
+++ b/libs/hwui/OpenGLReadback.cpp
@@ -280,6 +280,11 @@ CopyResult OpenGLReadbackImpl::copyImageInto(EGLImageKHR eglImage,
 
 bool OpenGLReadbackImpl::copyLayerInto(renderthread::RenderThread& renderThread,
         GlLayer& layer, SkBitmap* bitmap) {
+    if (!layer.isRenderable()) {
+        // layer has never been updated by DeferredLayerUpdater, abort copy
+        return false;
+    }
+
     return CopyResult::Success == copyTextureInto(Caches::getInstance(),
             renderThread.renderState(), layer.getTexture(), layer.getTexTransform(),
             Rect(), bitmap);
-- 
cgit v1.2.3-59-g8ed1b