diff options
| author | 2023-03-08 20:55:17 +0000 | |
|---|---|---|
| committer | 2023-03-08 20:55:17 +0000 | |
| commit | 4ab949d7fa7b11220429a2fd8e879ee222dbdf1b (patch) | |
| tree | e80cee807db0fd2354f4fffc3e6ae3bcdfd9eeb1 | |
| parent | 4a3044d1d2753e2181b6acb414a2af4e250b0a64 (diff) | |
| parent | 3ca388e8de0a162e08fb745cde028118b1e8ecc5 (diff) | |
Merge "Null checking window before starting dream" into tm-qpr-dev am: 3ca388e8de
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21798643
Change-Id: I42c53ec7d9e4581784e4414e649b1191ab080b43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/service/dreams/DreamService.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/service/dreams/DreamService.java b/core/java/android/service/dreams/DreamService.java index d79ea8929047..224307297e76 100644 --- a/core/java/android/service/dreams/DreamService.java +++ b/core/java/android/service/dreams/DreamService.java @@ -1409,6 +1409,10 @@ public class DreamService extends Service implements Window.Callback { // 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(), |