From aa6235d894cae5eb43a4da32798c037b25701b56 Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Mon, 2 Mar 2020 18:32:21 +0100
Subject: Fix unnecssary traversal for starting windows

Test: AppTransitionTests#testColdLaunchFromLauncher
Bug: 148985084
Change-Id: I526ad6d55c16b7b621229d142c1102dfd1cac1ad
---
 core/java/android/view/ViewRootImpl.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'core/java/android/view/ViewRootImpl.java')

diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 4a093e6038b8..4ce30c993c98 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -795,7 +795,12 @@ public final class ViewRootImpl implements ViewParent,
 
     public void setOnContentApplyWindowInsetsListener(OnContentApplyWindowInsetsListener listener) {
         mAttachInfo.mContentOnApplyWindowInsetsListener = listener;
-        requestFitSystemWindows();
+
+        // System windows will be fitted on first traversal, so no reason to request additional
+        // (possibly getting executed after the first traversal).
+        if (!mFirst) {
+            requestFitSystemWindows();
+        }
     }
 
     public void addWindowCallbacks(WindowCallbacks callback) {
-- 
cgit v1.2.3