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

Merge "Active container should contain non-finishing activity" into sc-v2-dev am: d0f8b5e99d

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

Change-Id: I4373a6edecbd7258f3a57ead613299fe13f4c70f
This commit is contained in:
Chris Li
2022-01-13 01:26:50 +00:00
committed by Automerger Merge Worker
parent e2b3ed45b5 d0f8b5e99d
commit 7f876cde41
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -346,7 +346,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen
TaskFragmentContainer getTopActiveContainer() { TaskFragmentContainer getTopActiveContainer() {
for (int i = mContainers.size() - 1; i >= 0; i--) { for (int i = mContainers.size() - 1; i >= 0; i--) {
TaskFragmentContainer container = mContainers.get(i); TaskFragmentContainer container = mContainers.get(i);
if (!container.isFinished()) { if (!container.isFinished() && container.getTopNonFinishingActivity() != null) {
return container; return container;
} }
} }