From f2b1cff4e2b152a7c776a7a79e8225a591f97d3e Mon Sep 17 00:00:00 2001
From: Andreas Gampe <agampe@google.com>
Date: Sun, 15 Mar 2015 15:07:19 -0700
Subject: [PATCH] Frameworks/base: Fix null-pointer check

Change-Id: I715a21c313e909ae654e0c1aa67bdf7bcd89de76
---
 graphics/java/android/graphics/drawable/VectorDrawable.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graphics/java/android/graphics/drawable/VectorDrawable.java b/graphics/java/android/graphics/drawable/VectorDrawable.java
index 8b0f635482e07..dd26019c9e37e 100644
--- a/graphics/java/android/graphics/drawable/VectorDrawable.java
+++ b/graphics/java/android/graphics/drawable/VectorDrawable.java
@@ -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 ||