commit bca73ac0c6903885ea667bbf9bc1231562d4f602
author Remi NGUYEN VAN <reminv@google.com> Wed May 15 10:55:49 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 15 10:55:49 2019 +0000
tree 8cbe4af931c0557f7f97d22b68a44ffc533fedb1
parent c3371300eba6eaba1cba75294f4b37d90d973758
parent fc4a83bd4b6d3ac573e777d45960f5f2949a6289

Merge "Add build targets for non-mainline NetworkStack" into qt-dev

core/java/android/view/WindowInsets.java

diff --git a/core/java/android/view/WindowInsets.java b/core/java/android/view/WindowInsets.java
index 2d292ef..9340b71 100644
--- a/core/java/android/view/WindowInsets.java
+++ b/core/java/android/view/WindowInsets.java
@@ -156,7 +156,9 @@
      * @param src Source to copy insets from
      */
     public WindowInsets(WindowInsets src) {
-        this(src.mTypeInsetsMap, src.mTypeMaxInsetsMap, src.mTypeVisibilityMap, src.mIsRound,
+        this(src.mSystemWindowInsetsConsumed ? null : src.mTypeInsetsMap,
+                src.mStableInsetsConsumed ? null : src.mTypeMaxInsetsMap,
+                src.mTypeVisibilityMap, src.mIsRound,
                 src.mAlwaysConsumeSystemBars, displayCutoutCopyConstructorArgument(src));
     }