Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make sure the control target has a control"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-10 22:24:43 +00:00
committed by Android (Google) Code Review
parent 4b5b834e13 3b3537e0a1
commit 2779c6c7a4
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/wm/InsetsSourceProvider.java
View File

@@ -59,6 +59,7 @@ class InsetsSourceProvider {
private final InsetsSourceControl mFakeControl;
private @Nullable InsetsSourceControl mControl;
private @Nullable InsetsControlTarget mControlTarget;
private @Nullable InsetsControlTarget mPendingControlTarget;
private @Nullable InsetsControlTarget mFakeControlTarget;
private @Nullable ControlAdapter mAdapter;
@@ -140,8 +141,9 @@ class InsetsSourceProvider {
mSource.setVisibleFrame(null);
} else if (mControllable) {
mWin.setControllableInsetProvider(this);
if (mControlTarget != null) {
updateControlForTarget(mControlTarget, true /* force */);
if (mPendingControlTarget != null) {
updateControlForTarget(mPendingControlTarget, true /* force */);
mPendingControlTarget = null;
}
}
}
@@ -245,7 +247,7 @@ class InsetsSourceProvider {
setWindow(null, null, null);
}
if (mWin == null) {
mControlTarget = target;
mPendingControlTarget = target;
return;
}
if (target == mControlTarget && !force) {