diff options
| author | 2016-02-01 16:10:53 +0000 | |
|---|---|---|
| committer | 2016-02-01 16:10:53 +0000 | |
| commit | 590f3de160178bbd4693d7720c367f773d7664fa (patch) | |
| tree | a84b184b9357d460825619a114d4fc24c92b4e9c | |
| parent | 40a11e525c3888613361a555d71ff13e5ef834e4 (diff) | |
| parent | 19a7b2836ee7b9dc54aee97b0ce0bfa1b6d76def (diff) | |
Merge "Fix crash in add QS tiles"
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java b/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java index a4d7e9349297..414cdbd21f93 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java @@ -172,7 +172,7 @@ public class TileAdapter extends BaseAdapter { } private void addTile(String spec, Icon icon, CharSequence label, Context context) { - addTile(spec, icon.getDrawable(context), label); + addTile(spec, icon != null ? icon.getDrawable(context) : null, label); } private View getView(Context context, View convertView, ViewGroup parent, |