Merge "Add nullptr check" into oc-mr1-dev

am: b20694ab00 Change-Id: I090a1d0a4f0b2b5ec8c599d795995ea242c2a6ca
2017-09-27 19:50:07 +00:00
parent 4726b4e8dc b20694ab00
commit 5fa85b7e2e
1 changed files with 4 additions and 2 deletions
--- 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;
    }