commit c5fec774b2d494485da060e7eea456049ae53ffc
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon May 06 22:55:57 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 06 22:55:57 2024 +0000
tree 437689e5df10ea318360a867d4199e3dc53d9e41
parent 4f54ccebb52d92c27cdcbb72dc7f26a3123cb28a
parent 7435831cbd9f9e476cc0b2b2c8181a8fb114b1a5

Merge "Fix null pointer in FloatingWidgetView" into 24D1-dev

quickstep/src/com/android/quickstep/views/FloatingWidgetView.java

diff --git a/quickstep/src/com/android/quickstep/views/FloatingWidgetView.java b/quickstep/src/com/android/quickstep/views/FloatingWidgetView.java
index 6431bdf..486fc2c 100644
--- a/quickstep/src/com/android/quickstep/views/FloatingWidgetView.java
+++ b/quickstep/src/com/android/quickstep/views/FloatingWidgetView.java
@@ -305,7 +305,8 @@
      */
     public static int getDefaultBackgroundColor(
             Context context, RemoteAnimationTarget target) {
-        return (target != null && target.taskInfo.taskDescription != null)
+        return (target != null && target.taskInfo != null
+                && target.taskInfo.taskDescription != null)
                 ? target.taskInfo.taskDescription.getBackgroundColor()
                 : Themes.getColorBackground(context);
     }