commit 40f065d1fd21843e7edbf115e73ae2bd78dab645
author Randy Pfohl <randypfohl@google.com> Tue Mar 28 22:02:03 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 28 22:02:03 2023 +0000
tree 4c871773766333735f637c3871f1250bebafd76e
parent e7ab5849d76a5cb89b888e3078f8fe91cb7d72af
parent f96827b33146d535b94798e7885bd024c33a37e5

Merge "checking if outline provider is null to handle rare NPE" into tm-qpr-dev

quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java

diff --git a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
index af80d5f..7cd6756 100644
--- a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
+++ b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
@@ -326,7 +326,11 @@
     }
 
     private void setBannerOutline() {
-        mOldBannerOutlineProvider = mBanner.getOutlineProvider();
+        // TODO(b\273367585) to investigate why mBanner.getOutlineProvider() can be null
+        mOldBannerOutlineProvider = mBanner.getOutlineProvider() != null
+                ? mBanner.getOutlineProvider()
+                : ViewOutlineProvider.BACKGROUND;
+
         mBanner.setOutlineProvider(new ViewOutlineProvider() {
             @Override
             public void getOutline(View view, Outline outline) {