From b91ec50287ad57905e518db80435ce8b4aa4c41f Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Tue, 10 Jul 2018 09:14:57 -0700
Subject: [PATCH] Fix NPE in makeTransformCanvas

Test: builds && hwuiunit passes
Change-Id: Ie728832352b3652630c11bdb3115872482f12923
---
 libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp b/libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp
index 6fb2ee03cb502..441fa1158cb9d 100644
--- a/libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp
+++ b/libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp
@@ -46,9 +46,11 @@ void SkiaRecordingCanvas::initDisplayList(uirenderer::RenderNode* renderNode, in
 
     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);
 }