commit 3ca388e8de0a162e08fb745cde028118b1e8ecc5
author Prince Donkor <princedonkor@google.com> Wed Mar 08 20:30:31 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 08 20:30:31 2023 +0000
tree 48b5677f4fee576a2660f31fd75642d68ac00592
parent dd326938bc390243b2b8ef6b39716246d3153d16
parent 0993fbd81cbac381ebb5470f1fa0fd1a95daec39

Merge "Null checking window before starting dream" into tm-qpr-dev

core/java/android/service/dreams/DreamService.java

diff --git a/core/java/android/service/dreams/DreamService.java b/core/java/android/service/dreams/DreamService.java
index d79ea89..2243072 100644
--- a/core/java/android/service/dreams/DreamService.java
+++ b/core/java/android/service/dreams/DreamService.java
@@ -1409,6 +1409,10 @@
                             // Request the DreamOverlay be told to dream with dream's window
                             // parameters once the window has been attached.
                             mDreamStartOverlayConsumer = overlay -> {
+                                if (mWindow == null) {
+                                    Slog.d(TAG, "mWindow is null");
+                                    return;
+                                }
                                 try {
                                     overlay.startDream(mWindow.getAttributes(), mOverlayCallback,
                                             mDreamComponent.flattenToString(),