commit 2f06a23ed7806883802de5e36ad3eaeb19d68b5d
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 15 22:18:02 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 15 22:18:02 2022 +0000
tree 9f2e1e5b0f5c2077b75a6e2dda7d936738abef26
parent e0380381b73cba0f4f8fbdbb75ba933d214e8acd
parent fe7499723521df1762f963be6057ab5b4f0db080

Merge "Fix NPE in BubbleTextView" into tm-dev

src/com/android/launcher3/BubbleTextView.java

diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 041bee9..3bc0f6d 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -867,6 +867,11 @@
     }
 
     protected void applyCompoundDrawables(Drawable icon) {
+        if (icon == null) {
+            // Icon can be null when we use the BubbleTextView for text only.
+            return;
+        }
+
         // If we had already set an icon before, disable relayout as the icon size is the
         // same as before.
         mDisableRelayout = mIcon != null;