From bb56cf824b0aee1b4daa0c09f7670c1b33031008 Mon Sep 17 00:00:00 2001 From: Orhan Uysal Date: Fri, 14 Mar 2025 12:35:59 +0000 Subject: [PATCH] Temporarily add a null intent check. Due to b/403118101, add temproray null intent check to prevent tests from failing for longer until we identify why there is task with bunch of null fields. Bug: 403118101 Flag: EXEMPT Bug fix Test: m Change-Id: I11246c1143d1acbe45133f0e34785818bce3dba9 --- quickstep/src/com/android/quickstep/util/DesksUtils.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/quickstep/src/com/android/quickstep/util/DesksUtils.kt b/quickstep/src/com/android/quickstep/util/DesksUtils.kt index a10f7711fc..521ba27a8e 100644 --- a/quickstep/src/com/android/quickstep/util/DesksUtils.kt +++ b/quickstep/src/com/android/quickstep/util/DesksUtils.kt @@ -19,7 +19,6 @@ package com.android.quickstep.util 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 @@ class DesksUtils { @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 }