Merge "Frameworks/base: Fix null-pointer check"

2015-03-16 16:59:13 +00:00
parent d61cbf9a08 f2b1cff4e2
commit 007e207bde
1 changed files with 1 additions and 1 deletions
--- 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 ||