| commit | 4fde3dc72b5dce563a283354240b46ba81a90e6f | [log] [tgz] |
|---|---|---|
| author | Evan Rosky <erosky@google.com> | Wed Sep 28 19:39:40 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 28 19:39:40 2022 +0000 |
| tree | d09c5b2d8219b579c961bddfcf6a7fec1d9e4cfa | |
| parent | ddb4acc0d30bf164e068f84d143e44f0a0dd58f9 [diff] | |
| parent | 688d94c44ba15f31478c2d494fce9e9d178ebee3 [diff] |
Merge "Don't try to use display of detached task to update insets" into tm-qpr-dev am: 688d94c44b Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20069731 Change-Id: I5dced6a52f70830a11973f593150053584b96636 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java index 383fcb9..07ae167 100644 --- a/services/core/java/com/android/server/wm/WindowContainer.java +++ b/services/core/java/com/android/server/wm/WindowContainer.java
@@ -477,7 +477,10 @@ } mLocalInsetsSourceProviders.remove(insetsTypes[i]); } - mDisplayContent.getInsetsStateController().updateAboveInsetsState(true); + // Update insets if this window is attached. + if (mDisplayContent != null) { + mDisplayContent.getInsetsStateController().updateAboveInsetsState(true); + } } /**