diff --git a/core/java/android/view/InsetsFrameProvider.java b/core/java/android/view/InsetsFrameProvider.java index da54da16585d6..58ee59d1b36bf 100644 --- a/core/java/android/view/InsetsFrameProvider.java +++ b/core/java/android/view/InsetsFrameProvider.java @@ -31,6 +31,10 @@ import java.util.Objects; * * The insets frame will by default as the window frame size. If the providers are set, the * calculation result based on the source size will be used as the insets frame. + * + * The InsetsFrameProvider should be self-contained. Nothing describing the window itself, such as + * contentInsets, visibleInsets, etc. won't affect the insets providing to other windows when this + * is set. * @hide */ public class InsetsFrameProvider implements Parcelable { diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java index 87239944fa609..0db032b9806ed 100644 --- a/services/core/java/com/android/server/wm/DisplayPolicy.java +++ b/services/core/java/com/android/server/wm/DisplayPolicy.java @@ -1203,7 +1203,6 @@ public class DisplayPolicy { return null; } return (displayFrames, windowContainer, inOutFrame) -> { - inOutFrame.inset(win.mGivenContentInsets); final LayoutParams lp = win.mAttrs.forRotation(displayFrames.mRotation); final InsetsFrameProvider ifp = lp.providedInsets[index]; InsetsFrameProvider.calculateInsetsFrame(displayFrames.mUnrestricted,