| commit | 5c588c95b49c4e95b1323176b09de74528902eb0 | [log] [tgz] |
|---|---|---|
| author | Randy Pfohl <randypfohl@google.com> | Tue Mar 28 22:58:47 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 28 22:58:47 2023 +0000 |
| tree | ca7363407cb30ac90b19f48c0e218384359627ae | |
| parent | 6164ce950ab89ec0d974baef023f46a07324b245 [diff] | |
| parent | a402713eb248f36d5992a53112f0afe354746ea4 [diff] |
Merge "checking if outline provider is null to handle rare NPE" into tm-qpr-dev am: 40f065d1fd am: a402713eb2 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21995352 Change-Id: I7f20393c364b09d13e2c7027ddf85ac6552e62f2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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) {