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

Remove host activity association when removing EmbeddedWindow

Browse Source 
The common steps to destroy an activity is first to remove its window
and then the activity record. So if EmbeddedWindow is removed when
removing the window, onActivityRemoved won't be able to match.

If an ActivityRecord is removed, its window will also be removed.
So it can simply clean the host records when removing EmbeddedWindow.

Bug: 296535363
Test: Launch "Wallpaper & style" from home several times.
  > adb shell dumpsys activity p | grep -A2 "Remote Activities"
  The output should only show one record per owner process.
  And then remove the task from recents.
  > adb shell dumpsys activity p | grep "Remote Activities"
  The output should be empty.
Change-Id: Iebe96417ed5be1832995ad7649408c28e6c0f58c
This commit is contained in:
Riddle Hsu
2023-08-18 18:20:42 +08:00
parent 558f38ac48
commit 352aa3d13c
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -4364,7 +4364,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
// Reset the last saved PiP snap fraction on removal.
mDisplayContent.mPinnedTaskController.onActivityHidden(mActivityComponent);
mDisplayContent.onRunningActivityChanged();
mWmService.mEmbeddedWindowController.onActivityRemoved(this);
mRemovingFromDisplay = false;
}

20
services/core/java/com/android/server/wm/EmbeddedWindowController.java
View File

@@ -135,19 +135,6 @@ class EmbeddedWindowController {
return mWindowsByWindowToken.get(windowToken);
}
void onActivityRemoved(ActivityRecord activityRecord) {
for (int i = mWindows.size() - 1; i >= 0; i--) {
final EmbeddedWindow window = mWindows.valueAt(i);
if (window.mHostActivityRecord == activityRecord) {
final WindowProcessController processController =
mAtmService.getProcessController(window.mOwnerPid, window.mOwnerUid);
if (processController != null) {
processController.removeHostActivity(activityRecord);
}
}
}
}
static class EmbeddedWindow implements InputTarget {
final IWindow mClient;
@Nullable final WindowState mHostWindowState;
@@ -230,6 +217,13 @@ class EmbeddedWindowController {
mInputChannel.dispose();
mInputChannel = null;
}
if (mHostActivityRecord != null) {
final WindowProcessController wpc =
mWmService.mAtmService.getProcessController(mOwnerPid, mOwnerUid);
if (wpc != null) {
wpc.removeHostActivity(mHostActivityRecord);
}
}
}
@Override