diff options
| author | Chris Li <lihongyu@google.com> | 2022-01-13 01:09:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-01-13 01:09:44 +0000 |
| commit | d0f8b5e99d5bcec8c47e458d57331ddb51141f02 (patch) | |
| tree | 291e6229e1beb023fc29978f66c41327e701e505 /libs/WindowManager | |
| parent | 8be6f0ccbe8203a4d2bcc04927663febcfe83f1c (diff) | |
| parent | be242f468458ca83b4ca0e131e46f725d6105d79 (diff) | |
Merge "Active container should contain non-finishing activity" into sc-v2-dev
Diffstat (limited to 'libs/WindowManager')
| -rw-r--r-- | libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java index b8e8b0114b47..ed5f706618ad 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java @@ -346,7 +346,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen TaskFragmentContainer getTopActiveContainer() { for (int i = mContainers.size() - 1; i >= 0; i--) { TaskFragmentContainer container = mContainers.get(i); - if (!container.isFinished()) { + if (!container.isFinished() && container.getTopNonFinishingActivity() != null) { return container; } } |