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

Merge "QS: Protect against crash with no icon" into nyc-dev am: 7b945d8d30

Browse Source 
am: a58c1a52ac

* commit 'a58c1a52ac44a53175475f78cea074583ed5e177':
  QS: Protect against crash with no icon

Change-Id: I20c0c15d3e7358f056198280d8d9c2b0d9ca4115
This commit is contained in:
Jason Monk
2016-06-01 17:34:18 +00:00
committed by android-build-merger
parent 86a0e3befe a58c1a52ac
commit 71a7976e35
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/qs/QSIconView.java
View File

@@ -80,7 +80,7 @@ public class QSIconView extends ViewGroup {
Drawable d = state.icon != null Drawable d = state.icon != null
? iv.isShown() && mAnimationEnabled ? state.icon.getDrawable(mContext) ? iv.isShown() && mAnimationEnabled ? state.icon.getDrawable(mContext)
: state.icon.getInvisibleDrawable(mContext) : null; : state.icon.getInvisibleDrawable(mContext) : null;
int padding = state.icon != null ? state.icon.getPadding() : null; int padding = state.icon != null ? state.icon.getPadding() : 0;
if (d != null && state.autoMirrorDrawable) { if (d != null && state.autoMirrorDrawable) {
d.setAutoMirrored(true); d.setAutoMirrored(true);
} }