commit 08067d98295303cf9c8235ab27b3e6e8038f084c
author Andreas Gampe <agampe@google.com> Mon Mar 16 17:20:12 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 16 17:20:12 2015 +0000
tree d5982453c1925a7e748e9f31355bffd2a75bb1b3
parent ebb8922a5baf091b419c3545ef74b1ee2097b21b
parent 8e176d396d393af90ffe288d849e95ff40aa2b23

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

* commit '8e176d396d393af90ffe288d849e95ff40aa2b23':
  Frameworks/base: Fix null-pointer check

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

diff --git a/graphics/java/android/graphics/drawable/VectorDrawable.java b/graphics/java/android/graphics/drawable/VectorDrawable.java
index 5f1dcec..c5e53da 100644
--- a/graphics/java/android/graphics/drawable/VectorDrawable.java
+++ b/graphics/java/android/graphics/drawable/VectorDrawable.java
@@ -408,7 +408,7 @@
      * @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 ||