From 91370114ea6aacf3189a57eac25c960509208dd6 Mon Sep 17 00:00:00 2001 From: Uwais Ashraf Date: Thu, 20 Feb 2025 17:03:27 +0000 Subject: [PATCH] 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 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/quickstep/src/com/android/quickstep/views/TaskView.kt b/quickstep/src/com/android/quickstep/views/TaskView.kt index 49ec31dbab..ba5423217e 100644 --- a/quickstep/src/com/android/quickstep/views/TaskView.kt +++ b/quickstep/src/com/android/quickstep/views/TaskView.kt @@ -789,11 +789,11 @@ constructor( 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 @@ constructor( */ 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) }