commit b91ec50287ad57905e518db80435ce8b4aa4c41f
author John Reck <jreck@google.com> Tue Jul 10 09:14:57 2018 -0700
committer John Reck <jreck@google.com> Tue Jul 10 09:14:57 2018 -0700
tree d58aabd9736664658e8a38e1158901e932abb308
parent 0ae3baae77a2d690edc43afd9d24bd73ed2e8bfa

Fix NPE in makeTransformCanvas

Test: builds && hwuiunit passes
Change-Id: Ie728832352b3652630c11bdb3115872482f12923

libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp

diff --git a/libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp b/libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp
index 6fb2ee0..441fa11 100644
--- a/libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp
+++ b/libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp
@@ -46,9 +46,11 @@
 
     mDisplayList->attachRecorder(&mRecorder, SkIRect::MakeWH(width, height));
     SkCanvas* canvas = &mRecorder;
-    mWrappedCanvas = makeTransformCanvas(&mRecorder, renderNode->usageHint());
-    if (mWrappedCanvas) {
-        canvas = mWrappedCanvas.get();
+    if (renderNode) {
+        mWrappedCanvas = makeTransformCanvas(&mRecorder, renderNode->usageHint());
+        if (mWrappedCanvas) {
+            canvas = mWrappedCanvas.get();
+        }
     }
     SkiaCanvas::reset(canvas);
 }