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

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

Browse Source 
* commit '007e207bdeda3f0143eba8f52db3e72bf7487efb':
  Frameworks/base: Fix null-pointer check
This commit is contained in:
Andreas Gampe
2015-03-16 17:12:57 +00:00
committed by Android Git Automerger
parent 19279ec048 007e207bde
commit 8e176d396d
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
*/
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 ||