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

Commit 8e176d39 authored by Andreas Gampe's avatar Andreas Gampe Committed by Android Git Automerger
Browse files

am 007e207b: Merge "Frameworks/base: Fix null-pointer check" 

* commit '007e207b':
  Frameworks/base: Fix null-pointer check
parents 19279ec0 007e207b

graphics/java/android/graphics/drawable/VectorDrawable.java

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ public class VectorDrawable extends Drawable { 
     * @hide

     */

    public float getPixelSize() {

        if (mVectorState == null && mVectorState.mVPathRenderer == null ||

        if (mVectorState == null || mVectorState.mVPathRenderer == null ||

                mVectorState.mVPathRenderer.mBaseWidth == 0 ||

                mVectorState.mVPathRenderer.mBaseHeight == 0 ||

                mVectorState.mVPathRenderer.mViewportHeight == 0 ||