From 64212c5439dd40204256630dd7c01cf68a02047f Mon Sep 17 00:00:00 2001 From: Jeremy Sim Date: Fri, 18 Mar 2022 16:55:17 -0700 Subject: [PATCH] Fix crash condition by adding a null check in DigitalWellBeingToast Fixes a crash condition where TaskView#getRecentsView() could return null when being called from DigitalWellBeingToast#setBanner(), resulting in a crash. Fixes: 217671133 Test: Manual Change-Id: I964384d97d26336e9a5e8e4c025f66ab78c63e0a --- .../src/com/android/quickstep/views/DigitalWellBeingToast.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java index 27a748d3f2..79b15c713a 100644 --- a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java +++ b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java @@ -306,7 +306,7 @@ public final class DigitalWellBeingToast { private void setBanner(@Nullable View view) { mBanner = view; - if (view != null) { + if (view != null && mTaskView.getRecentsView() != null) { setupAndAddBanner(); setBannerOutline(); }