commit a909cc2dd7cbc909e3a60d1ac2e242bf6681d7a3
author Fengjiang Li <fengjial@google.com> Wed Oct 02 13:28:02 2024 -0700
committer Fengjiang Li <fengjial@google.com> Wed Oct 02 14:30:08 2024 -0700
tree f9d719ada1d0a1a15790326019be24e5626a611b
parent 2b1208e803c29c5b6f15652ae8270b21de8fd33a

[NPE] Fix NPE of TaskInfo in FloatingWidgetView#getDefaultBackgroundColor

Fix: 370315165
Flag: NONE - prod crash
Test: presubmit
Change-Id: I50e71f0611fc9c664cfe51fbe9c3fc21462e10ed

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 bdca596..b719ee5 100644
--- a/quickstep/src/com/android/quickstep/views/FloatingWidgetView.java
+++ b/quickstep/src/com/android/quickstep/views/FloatingWidgetView.java
@@ -18,6 +18,7 @@
 import android.animation.Animator;
 import android.animation.Animator.AnimatorListener;
 import android.annotation.TargetApi;
+import android.app.TaskInfo;
 import android.content.Context;
 import android.graphics.Matrix;
 import android.graphics.RectF;
@@ -333,11 +334,16 @@
      * context's theme background color.
      */
     public static int getDefaultBackgroundColor(
-            Context context, RemoteAnimationTarget target) {
-        return (target != null && target.taskInfo != null
-                && target.taskInfo.taskDescription != null)
-                ? target.taskInfo.taskDescription.getBackgroundColor()
-                : Themes.getColorBackground(context);
+            Context context, @Nullable RemoteAnimationTarget target) {
+        final int fallbackColor = Themes.getColorBackground(context);
+        if (target == null) {
+            return fallbackColor;
+        }
+        final TaskInfo taskInfo = target.taskInfo;
+        if (taskInfo == null) {
+            return fallbackColor;
+        }
+        return taskInfo.taskDescription.getBackgroundColor();
     }
 
     private static void getRelativePosition(View descendant, View ancestor, RectF position) {