From 3885bf6f048c98148d6c1962ff5c8cef7abe8625 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Wed, 27 Sep 2017 09:30:30 -0700
Subject: Add nullptr check

Bug: 65717856
Test: builds
Change-Id: I188d3366e956f087c6317ae0b56d5fb19a20708d
---
 graphics/java/android/graphics/Shader.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/graphics/java/android/graphics/Shader.java b/graphics/java/android/graphics/Shader.java
index 0209cea4e2e5..40288f5ec8af 100644
--- a/graphics/java/android/graphics/Shader.java
+++ b/graphics/java/android/graphics/Shader.java
@@ -159,8 +159,10 @@ public class Shader {
         if (mNativeInstance == 0) {
             mNativeInstance = createNativeInstance(mLocalMatrix == null
                     ? 0 : mLocalMatrix.native_instance);
-            mCleaner = NoImagePreloadHolder.sRegistry.registerNativeAllocation(
-                    this, mNativeInstance);
+            if (mNativeInstance != 0) {
+                mCleaner = NoImagePreloadHolder.sRegistry.registerNativeAllocation(
+                        this, mNativeInstance);
+            }
         }
         return mNativeInstance;
     }
-- 
cgit v1.2.3-59-g8ed1b