commit 3cd737db84d13dc8a7f896a4b2fe4128fbc8abf1
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Feb 20 11:03:26 2025 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 20 11:03:26 2025 -0800
tree a6b324c071dc0636f733d83b3070abb32e99db11
parent e8a17196497f89a211a1077acc5ac33bceafdd34
parent 91370114ea6aacf3189a57eac25c960509208dd6

Merge "Add null checks to prevent NPE on ViewModel." into main

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)
     }