Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andreas Gampe
2015-03-16 16:59:13 +00:00
committed by Gerrit Code Review
parent d61cbf9a08 f2b1cff4e2
commit 007e207bde
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
graphics/java/android/graphics/drawable/VectorDrawable.java
View File

@@ -396,7 +396,7 @@ public class VectorDrawable extends Drawable {
* @hide * @hide
*/ */
public float getPixelSize() { public float getPixelSize() {
if (mVectorState == null && mVectorState.mVPathRenderer == null || if (mVectorState == null || mVectorState.mVPathRenderer == null ||
mVectorState.mVPathRenderer.mBaseWidth == 0 || mVectorState.mVPathRenderer.mBaseWidth == 0 ||
mVectorState.mVPathRenderer.mBaseHeight == 0 || mVectorState.mVPathRenderer.mBaseHeight == 0 ||
mVectorState.mVPathRenderer.mViewportHeight == 0 || mVectorState.mVPathRenderer.mViewportHeight == 0 ||