commit 91370114ea6aacf3189a57eac25c960509208dd6
author Uwais Ashraf <uwaisashraf@google.com> Thu Feb 20 17:03:27 2025 +0000
committer Uwais Ashraf <uwaisashraf@google.com> Thu Feb 20 17:03:27 2025 +0000
tree 8ddde2bec16d6206d7f82e478a60f942284e96d7
parent c7e545674d530f005d48605845f83c6fce825d4c

Add null checks to prevent NPE on ViewModel.

ViewModel can be null if onRecycle completes before coroutineJob is cancelled.

Fix: 395751707
Flag: Exempt - test fix
Test: OpenActivityEmbeddingPlaceholderSplitTest in postsubmit
Change-Id: I12e1f6e2e5951ae04264fc8ea9d45b6ac6d43308

quickstep/src/com/android/quickstep/views/TaskView.kt

diff --git a/quickstep/src/com/android/quickstep/views/TaskView.kt b/quickstep/src/com/android/quickstep/views/TaskView.kt
index 49ec31d..ba54232 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.kt
+++ b/quickstep/src/com/android/quickstep/views/TaskView.kt
@@ -789,11 +789,11 @@
 
     private fun updateThumbnailValidity(container: TaskContainer) {
         container.isThumbnailValid =
-            viewModel!!.isThumbnailValid(
+            viewModel?.isThumbnailValid(
                 thumbnail = container.thumbnailData,
                 width = container.thumbnailView.width,
                 height = container.thumbnailView.height,
-            )
+            ) ?: return
         applyThumbnailSplashAlpha()
     }
 
@@ -810,7 +810,8 @@
      */
     private fun updateThumbnailMatrix(container: TaskContainer, width: Int, height: Int) {
         val thumbnailPosition =
-            viewModel!!.getThumbnailPosition(container.thumbnailData, width, height, isLayoutRtl)
+            viewModel?.getThumbnailPosition(container.thumbnailData, width, height, isLayoutRtl)
+                ?: return
         container.updateThumbnailMatrix(thumbnailPosition.matrix)
     }