Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fa85b7e authored by John Reck's avatar John Reck Committed by android-build-merger
Browse files

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

am: b20694ab

Change-Id: I090a1d0a4f0b2b5ec8c599d795995ea242c2a6ca
parents 4726b4e8 b20694ab

graphics/java/android/graphics/Shader.java

+4 −2
Original line number Diff line number Diff line
@@ -159,9 +159,11 @@ public class Shader { 
        if (mNativeInstance == 0) {

            mNativeInstance = createNativeInstance(mLocalMatrix == null

                    ? 0 : mLocalMatrix.native_instance);

            if (mNativeInstance != 0) {

                mCleaner = NoImagePreloadHolder.sRegistry.registerNativeAllocation(

                        this, mNativeInstance);

            }

        }

        return mNativeInstance;

    }