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

Browse Source 
am: 7b945d8d30

* commit '7b945d8d30a6e3978b50d5952539279a71148eca':
  QS: Protect against crash with no icon

Change-Id: I6e4fedcad9d788fcb2b8c803e905671bfff3f561
This commit is contained in:
Jason Monk
2016-06-01 17:14:50 +00:00
committed by android-build-merger
parent 72bc1299f2 7b945d8d30
commit a58c1a52ac
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
? iv.isShown() && mAnimationEnabled ? state.icon.getDrawable(mContext)
: 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) {
d.setAutoMirrored(true);
}