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

Commit 55094653 authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-cd88620d-8a17-4592-86c7-f98ff940a436" into ub-launcher3-master 

* changes:
  [automerger] Handle null small icon am: 207f7d7f
  Handle null small icon
parents 10a1bd0e d4899cfc

src/com/android/launcher3/notification/NotificationInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ public class NotificationInfo implements View.OnClickListener { 
        if (icon == null) {

            // Use the small icon.

            icon = notification.getSmallIcon();

            mIconDrawable = icon.loadDrawable(context);

            mIconDrawable = icon == null ? null : icon.loadDrawable(context);

            mIconColor = statusBarNotification.getNotification().color;

            mIsIconLarge = false;

        } else {