Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec18e866 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I7c75214d6ca18355cb155529de8a83a79de97733
parents 3c94e784 2df58a47

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

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ class TaskFragmentContainer { 
        ActivityThread activityThread = ActivityThread.currentActivityThread();

        for (IBinder token : mInfo.getActivities()) {

            Activity activity = activityThread.getActivity(token);

            if (activity != null && !allActivities.contains(activity)) {

            if (activity != null && !activity.isFinishing() && !allActivities.contains(activity)) {

                allActivities.add(activity);

            }

        }

services/core/java/com/android/server/wm/TaskFragment.java

+6 −7
Original line number Diff line number Diff line
@@ -2191,14 +2191,13 @@ class TaskFragment extends WindowContainer<WindowContainer> { 
    TaskFragmentInfo getTaskFragmentInfo() {

        List<IBinder> childActivities = new ArrayList<>();

        for (int i = 0; i < getChildCount(); i++) {

            WindowContainer wc = getChildAt(i);

            if (mTaskFragmentOrganizerUid != INVALID_UID

                    && wc.asActivityRecord() != null

                    && wc.asActivityRecord().info.processName.equals(

                            mTaskFragmentOrganizerProcessName)

                    && wc.asActivityRecord().getUid() == mTaskFragmentOrganizerUid) {

            final WindowContainer wc = getChildAt(i);

            final ActivityRecord ar = wc.asActivityRecord();

            if (mTaskFragmentOrganizerUid != INVALID_UID && ar != null

                    && ar.info.processName.equals(mTaskFragmentOrganizerProcessName)

                    && ar.getUid() == mTaskFragmentOrganizerUid && !ar.finishing) {

                // 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();