Merge "Don't try to use display of detached task to update insets" into tm-qpr-dev

2022-09-28 18:42:13 +00:00
parent f8fa73acde 22dd0b7e34
commit 688d94c44b
1 changed files with 4 additions and 1 deletions
--- 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<E extends 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);
+        }
    }

    /**