Merge "Add nullptr check" into oc-mr1-dev am: b20694ab00

am: 5fa85b7e2e Change-Id: Ieb93edf167a158a1f1759c6ffc6f492eac0b4144
2017-09-27 19:56:58 +00:00
parent ef48ae837f 5fa85b7e2e
commit bfc7a118fc
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;
    }