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

Check for null parent when migrating SurfaceControl

Browse Source 
When migrating the SurfaceControl, the WC parent can be null. In this
case, we create a new SurfaceControl, but set it's parent to null so the
layer is still available, but will be offscreen. This way if the parent
becomes non null, the SC can get re-parented to the new parent.

Test: Split screen with removing secondary app
Bug: 153579514
Change-Id: Id0e2f2d5e5b7448c3cafd5b90120777f5175153c
This commit is contained in:
chaviw
2020-05-27 10:09:10 -07:00
parent 2046776127
commit 0a947d9590
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/core/java/com/android/server/wm/WindowContainer.java
View File

@@ -399,7 +399,11 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
}
void createSurfaceControl(boolean force) {
setSurfaceControl(makeSurface().build());
setInitialSurfaceControlProperties(makeSurface().build());
}
private void setInitialSurfaceControlProperties(SurfaceControl surfaceControl) {
setSurfaceControl(surfaceControl);
getPendingTransaction().show(mSurfaceControl);
onSurfaceShown(getPendingTransaction());
updateSurfacePosition();
@@ -423,7 +427,16 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
// Clear the last position so the new SurfaceControl will get correct position
mLastSurfacePosition.set(0, 0);
createSurfaceControl(false /* force */);
final SurfaceControl.Builder b = mWmService.makeSurfaceBuilder(null)
.setContainerLayer()
.setName(getName());
setInitialSurfaceControlProperties(b.build());
// If parent is null, the layer should be placed offscreen so reparent to null. Otherwise,
// set to the available parent.
t.reparent(mSurfaceControl, mParent == null ? null : mParent.getSurfaceControl());
if (mLastRelativeToLayer != null) {
t.setRelativeLayer(mSurfaceControl, mLastRelativeToLayer, mLastLayer);
} else {