commit afd0b905e25c0bba6765c7b3cf25890eb37dfda5
author Orhan Uysal <uysalorhan@google.com> Mon Mar 17 09:04:45 2025 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 17 09:04:45 2025 -0700
tree 704739c63992f02f0d71c452aacab9d1a1ef3be8
parent e58dac962c4ed89f45f018cdcc6d37a0049a6d12
parent bb56cf824b0aee1b4daa0c09f7670c1b33031008

Merge "Temporarily add a null intent check." into main

quickstep/src/com/android/quickstep/util/DesksUtils.kt

diff --git a/quickstep/src/com/android/quickstep/util/DesksUtils.kt b/quickstep/src/com/android/quickstep/util/DesksUtils.kt
index a10f771..521ba27 100644
--- a/quickstep/src/com/android/quickstep/util/DesksUtils.kt
+++ b/quickstep/src/com/android/quickstep/util/DesksUtils.kt
@@ -19,7 +19,6 @@
 import android.app.TaskInfo
 import android.content.ComponentName
 import android.content.res.Resources
-import android.util.Log
 import android.window.DesktopExperienceFlags
 import com.android.systemui.shared.recents.model.Task
 
@@ -40,7 +39,9 @@
 
         @JvmStatic
         fun isDesktopWallpaperTask(taskInfo: TaskInfo): Boolean {
-            Log.d("b/403118101", "isDesktopWallpaperTask: $taskInfo")
+            // TODO: b/403118101 - In some launcher tests, there is a task with baseIntent set to
+            // null. Remove this check after finding out how that task is created.
+            if (taskInfo.baseIntent == null) return false
             return taskInfo.baseIntent.component?.let(::isDesktopWallpaperComponent) == true
         }