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

Merge changes from topic "activity-embedding-finish-tests-1" into sc-v2-dev am: 2df58a479c

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

Change-Id: I7c75214d6ca18355cb155529de8a83a79de97733
This commit is contained in:
TreeHugger Robot
2021-12-07 20:57:55 +00:00
committed by Automerger Merge Worker
parent 3c94e78492 2df58a479c
commit ec18e866ef
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskFragmentContainer.java
View File

@@ -103,7 +103,7 @@ class TaskFragmentContainer {
ActivityThread activityThread = ActivityThread.currentActivityThread(); ActivityThread activityThread = ActivityThread.currentActivityThread();
for (IBinder token : mInfo.getActivities()) { for (IBinder token : mInfo.getActivities()) {
Activity activity = activityThread.getActivity(token); Activity activity = activityThread.getActivity(token);
if (activity != null && !allActivities.contains(activity)) { if (activity != null && !activity.isFinishing() && !allActivities.contains(activity)) {
allActivities.add(activity); allActivities.add(activity);
} }
} }

13
services/core/java/com/android/server/wm/TaskFragment.java
View File

@@ -2191,14 +2191,13 @@ class TaskFragment extends WindowContainer<WindowContainer> {
TaskFragmentInfo getTaskFragmentInfo() { TaskFragmentInfo getTaskFragmentInfo() {
List<IBinder> childActivities = new ArrayList<>(); List<IBinder> childActivities = new ArrayList<>();
for (int i = 0; i < getChildCount(); i++) { for (int i = 0; i < getChildCount(); i++) {
WindowContainer wc = getChildAt(i); final WindowContainer wc = getChildAt(i);
if (mTaskFragmentOrganizerUid != INVALID_UID final ActivityRecord ar = wc.asActivityRecord();
&& wc.asActivityRecord() != null if (mTaskFragmentOrganizerUid != INVALID_UID && ar != null
&& wc.asActivityRecord().info.processName.equals( && ar.info.processName.equals(mTaskFragmentOrganizerProcessName)
mTaskFragmentOrganizerProcessName) && ar.getUid() == mTaskFragmentOrganizerUid && !ar.finishing) {
&& wc.asActivityRecord().getUid() == mTaskFragmentOrganizerUid) {
// Only includes Activities that belong to the organizer process for security. // Only includes Activities that belong to the organizer process for security.
childActivities.add(wc.asActivityRecord().appToken); childActivities.add(ar.appToken);
} }
} }
final Point positionInParent = new Point(); final Point positionInParent = new Point();