Merge "WindowInsetsController: make available after addView" into rvc-dev

1 files changed, 3 insertions, 0 deletions

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index f98c1f660cfa..310299910e96 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -11519,6 +11519,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
         ViewParent parent = getParent();
         if (parent instanceof View) {
             return ((View) parent).getWindowInsetsController();
+        } else if (parent instanceof ViewRootImpl) {
+            // Between WindowManager.addView() and the first traversal AttachInfo isn't set yet.
+            return ((ViewRootImpl) parent).getInsetsController();
         }
         return null;
     }