Merge "Do Not Report Activities that are Finishing" (149908e1) · Commits · e / os / android_frameworks_base

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);
		}
		}

+6 −7

Original line number	Diff line number	Diff line
		@@ -2187,14 +2187,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().token);
		childActivities.add(ar.token);
		}
		}
		final Point positionInParent = new Point();