From 22dd0b7e34ba09f803f1dd3daa7fbf8f5277a1e6 Mon Sep 17 00:00:00 2001 From: Evan Rosky Date: Wed, 28 Sep 2022 00:15:10 +0000 Subject: [PATCH] Don't try to use display of detached task to update insets If insets overrides change on a detached task, it shouldn't have an effect anyways, so don't try to access the display-content (which will be null when detached) Bug: 249151208 Test: atest NexusLauncherTests:com.android.launcher3.ui.TaplTestsLauncher3#testAppIconLaunchFromAllAppsFromHome Change-Id: I97bbb569f99c4f7bdd7e865c9a8122fc6b49bc79 --- .../core/java/com/android/server/wm/WindowContainer.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java index 383fcb9303d72..07ae167f5e669 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 @@ class WindowContainer extends ConfigurationContainer< } mLocalInsetsSourceProviders.remove(insetsTypes[i]); } - mDisplayContent.getInsetsStateController().updateAboveInsetsState(true); + // Update insets if this window is attached. + if (mDisplayContent != null) { + mDisplayContent.getInsetsStateController().updateAboveInsetsState(true); + } } /**