commit f5a370e097eb5bc29198dc53f956ba07f72842e5
author Derek Sollenberger <djsollen@google.com> Thu Jun 15 13:50:08 2017 -0400
committer Derek Sollenberger <djsollen@google.com> Thu Jun 15 13:55:08 2017 -0400
tree 9522a3d1ef388bbaf68213728ce263d73e55bc68
parent 0a47bdbe4b1d8e99a56c505b65b8578c6e92d657

Fix SurfaceTexture CTS test case when using the Skia pipeline.

Test: UiRendering CTS TextureViewTests#testReuseSurfaceTexture
Change-Id: Iaf665b88b83cacfbbd37c93aaebc64e937053cb7

libs/hwui/pipeline/skia/LayerDrawable.cpp

diff --git a/libs/hwui/pipeline/skia/LayerDrawable.cpp b/libs/hwui/pipeline/skia/LayerDrawable.cpp
index 2ebfbcc..a28355b 100644
--- a/libs/hwui/pipeline/skia/LayerDrawable.cpp
+++ b/libs/hwui/pipeline/skia/LayerDrawable.cpp
@@ -27,7 +27,10 @@
 namespace skiapipeline {
 
 void LayerDrawable::onDraw(SkCanvas* canvas) {
-    DrawLayer(canvas->getGrContext(), canvas, mLayer.get());
+    Layer* layer = mLayerUpdater->backingLayer();
+    if (layer) {
+        DrawLayer(canvas->getGrContext(), canvas, layer);
+    }
 }
 
 bool LayerDrawable::DrawLayer(GrContext* context, SkCanvas* canvas, Layer* layer) {