drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent NPE when draw is called without bounds being set

Browse Source 
Test: unit test inside AdaptiveIconDrawableTest.java

Change-Id: Ic3260ce9c6bae595c7eba7be1cd7ae249939a1cf
This commit is contained in:
Hyunyoung Song
2017-04-03 00:23:49 -07:00
parent 21a5edcc24
commit 55211c032c
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java
View File

@ -304,6 +304,9 @@ public class AdaptiveIconDrawable extends Drawable implements Drawable.Callback
@Override @Override
public void draw(Canvas canvas) { public void draw(Canvas canvas) {
if (mLayersBitmap == null) {
return;
}
if (mLayersShader == null) { if (mLayersShader == null) {
mCanvas.setBitmap(mLayersBitmap); mCanvas.setBitmap(mLayersBitmap);
for (int i = 0; i < mLayerState.N_CHILDREN; i++) { for (int i = 0; i < mLayerState.N_CHILDREN; i++) {