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

Handle nullable drawables inside MaskableIconDrawable

Browse Source 
Test: manual test
b/34902453

Change-Id: I36fc48f7e4c1f6503a9c26b8f239c62da729b490
This commit is contained in:
Hyunyoung Song
2017-02-02 00:53:06 -08:00
parent 419fbce429
commit 3084ec2df4
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
graphics/java/android/graphics/drawable/MaskableIconDrawable.java
View File

@@ -726,6 +726,9 @@ public class MaskableIconDrawable extends Drawable implements Drawable.Callback
int width = -1;
for (int i = 0; i < mLayerState.N_CHILDREN; i++) {
final ChildDrawable r = mLayerState.mChildren[i];
if (r.mDrawable == null) {
continue;
}
final int w = r.mDrawable.getIntrinsicWidth();
if (w > width) {
width = w;
@@ -743,6 +746,9 @@ public class MaskableIconDrawable extends Drawable implements Drawable.Callback
int height = -1;
for (int i = 0; i < mLayerState.N_CHILDREN; i++) {
final ChildDrawable r = mLayerState.mChildren[i];
if (r.mDrawable == null) {
continue;
}
final int h = r.mDrawable.getIntrinsicHeight();
if (h > height) {
height = h;