Merge "Correct the default value of mRequestedInsetsState" into rvc-dev am: 7a61fb6aa9 am: b187e3875d

Change-Id: Ic77654609be7cf3aeb8a00b0e4a03a1a69dda095
This commit is contained in:
Automerger Merge Worker
2020-03-06 01:43:42 +00:00

View File

@@ -657,7 +657,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
private boolean mIsDimming = false;
private @Nullable InsetsSourceProvider mControllableInsetProvider;
private InsetsState mRequestedInsetsState;
private final InsetsState mRequestedInsetsState = new InsetsState();
private static final float DEFAULT_DIM_AMOUNT_DEAD_WINDOW = 0.5f;
private KeyInterceptionInfo mKeyInterceptionInfo;
@@ -816,9 +816,6 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
mSeq = seq;
mPowerManagerWrapper = powerManagerWrapper;
mForceSeamlesslyRotate = token.mRoundedCornerOverlay;
mRequestedInsetsState = new InsetsState(
getDisplayContent().getInsetsPolicy().getInsetsForDispatch(this),
true /* copySources */);
if (DEBUG) {
Slog.v(TAG, "Window " + this + " client=" + c.asBinder()
+ " token=" + token + " (" + mAttrs.token + ")" + " params=" + a);