Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2891acd1 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

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

am: 7b945d8d

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

Change-Id: I6bf6ddc7a8331c2e324c5ae7c065c4eb9eb9fead
parents adc3f1ec 7b945d8d

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

+1 −1
Original line number Diff line number Diff line
@@ -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);

            }