commit e19cc141c388c7190a1582f0ee72c9ba67569a2d
author Jason Monk <jmonk@google.com> Wed Jun 01 10:25:01 2016 -0400
committer Jason Monk <jmonk@google.com> Wed Jun 01 10:25:01 2016 -0400
tree 040d8d25bc248d0148591aacd9544fb571296f94
parent 88be465ce572f84649e01744a7ec96b6346b3686

QS: Protect against crash with no icon

Change-Id: I65d594c9bf15190418d96cc6d2c426df00fed212
Fixes: 28941131

packages/SystemUI/src/com/android/systemui/qs/QSIconView.java

diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSIconView.java b/packages/SystemUI/src/com/android/systemui/qs/QSIconView.java
index 6c224f7..9c4a149 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSIconView.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSIconView.java
@@ -80,7 +80,7 @@
             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);
             }