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

[automerge] When adding overlay to a task, emit an immediate inset update 2p: 4eaf39219b

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17607621

Bug: 227202029
Change-Id: I2c45b3ab649b4ed2c2074130edd32c9db20d3de7
This commit is contained in:
Tyler Lacey
2022-04-06 13:48:02 +00:00
committed by Presubmit Automerger Backend
parent 7da27688d8 4eaf39219b
commit 1cdd0494b6
3 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/etc/services.core.protolog.json
View File

@@ -3433,6 +3433,12 @@
"group": "WM_DEBUG_FOCUS_LIGHT", "group": "WM_DEBUG_FOCUS_LIGHT",
"at": "com\/android\/server\/wm\/WindowState.java" "at": "com\/android\/server\/wm\/WindowState.java"
}, },
"1288920916": {
"message": "Error sending initial insets change to WindowContainer overlay",
"level": "ERROR",
"group": "WM_DEBUG_ANIM",
"at": "com\/android\/server\/wm\/WindowContainer.java"
},
"1305412562": { "1305412562": {
"message": "Report configuration: %s %s", "message": "Report configuration: %s %s",
"level": "VERBOSE", "level": "VERBOSE",

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

@@ -3859,7 +3859,8 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
@AnimationType int type, @Nullable AnimationAdapter snapshotAnim); @AnimationType int type, @Nullable AnimationAdapter snapshotAnim);
} }
void addTrustedOverlay(SurfaceControlViewHost.SurfacePackage overlay) { void addTrustedOverlay(SurfaceControlViewHost.SurfacePackage overlay,
@Nullable WindowState initialWindowState) {
if (mOverlayHost == null) { if (mOverlayHost == null) {
mOverlayHost = new TrustedOverlayHost(mWmService); mOverlayHost = new TrustedOverlayHost(mWmService);
} }
@@ -3875,6 +3876,20 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
"Error sending initial configuration change to WindowContainer overlay"); "Error sending initial configuration change to WindowContainer overlay");
removeTrustedOverlay(overlay); removeTrustedOverlay(overlay);
} }
// Emit an initial WindowState so that proper insets are available to overlay views
// shortly after the overlay is added.
if (initialWindowState != null) {
final InsetsState insetsState = initialWindowState.getInsetsState();
final Rect dispBounds = getBounds();
try {
overlay.getRemoteInterface().onInsetsChanged(insetsState, dispBounds);
} catch (Exception e) {
ProtoLog.e(WM_DEBUG_ANIM,
"Error sending initial insets change to WindowContainer overlay");
removeTrustedOverlay(overlay);
}
}
} }
void removeTrustedOverlay(SurfaceControlViewHost.SurfacePackage overlay) { void removeTrustedOverlay(SurfaceControlViewHost.SurfacePackage overlay) {

2
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -8135,7 +8135,7 @@ public class WindowManagerService extends IWindowManager.Stub
if (task == null) { if (task == null) {
throw new IllegalArgumentException("no task with taskId" + taskId); throw new IllegalArgumentException("no task with taskId" + taskId);
} }
task.addTrustedOverlay(overlay); task.addTrustedOverlay(overlay, task.getTopVisibleAppMainWindow());
} }
} }