diff options
| author | 2015-03-16 17:20:12 +0000 | |
|---|---|---|
| committer | 2015-03-16 17:20:12 +0000 | |
| commit | 08067d98295303cf9c8235ab27b3e6e8038f084c (patch) | |
| tree | d5982453c1925a7e748e9f31355bffd2a75bb1b3 | |
| parent | ebb8922a5baf091b419c3545ef74b1ee2097b21b (diff) | |
| parent | 8e176d396d393af90ffe288d849e95ff40aa2b23 (diff) | |
am 8e176d39: am 007e207b: Merge "Frameworks/base: Fix null-pointer check"
* commit '8e176d396d393af90ffe288d849e95ff40aa2b23':
Frameworks/base: Fix null-pointer check
| -rw-r--r-- | graphics/java/android/graphics/drawable/VectorDrawable.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/drawable/VectorDrawable.java b/graphics/java/android/graphics/drawable/VectorDrawable.java index 5f1dcec99f48..c5e53daa09f2 100644 --- a/graphics/java/android/graphics/drawable/VectorDrawable.java +++ b/graphics/java/android/graphics/drawable/VectorDrawable.java @@ -408,7 +408,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 || |