| commit | 791777822ec5bd177f5c03655411486e150be6ed | [log] [tgz] |
|---|---|---|
| author | ztenghui <ztenghui@google.com> | Wed May 24 10:42:13 2017 -0700 |
| committer | ztenghui <ztenghui@google.com> | Wed May 24 10:50:17 2017 -0700 |
| tree | a18a26b170472226e6c9faa560594a686bdaa98c | |
| parent | f992fa406b99401b7a295b12a49df9a2087ccee2 [diff] |
Fix the null check fix:62057025 Test: VDC tests Change-Id: If705fa04084a764c96d19e36bc850dca4ba26774
diff --git a/graphics/drawable/static/src/android/support/graphics/drawable/VectorDrawableCompat.java b/graphics/drawable/static/src/android/support/graphics/drawable/VectorDrawableCompat.java index 0dc2cda..f9753eb 100644 --- a/graphics/drawable/static/src/android/support/graphics/drawable/VectorDrawableCompat.java +++ b/graphics/drawable/static/src/android/support/graphics/drawable/VectorDrawableCompat.java
@@ -518,7 +518,7 @@ */ @RestrictTo(LIBRARY_GROUP) 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