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

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

Browse Source 
* commit '8e176d396d393af90ffe288d849e95ff40aa2b23':
  Frameworks/base: Fix null-pointer check
This commit is contained in:
Andreas Gampe
2015-03-16 17:20:12 +00:00
committed by Android Git Automerger
parent ebb8922a5b 8e176d396d
commit 08067d9829
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

@@ -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 ||