From f7a3e79fa3806b3d34b5641c6cd07c1f824b4028 Mon Sep 17 00:00:00 2001 From: Charles Chen Date: Tue, 15 Mar 2022 15:47:24 +0800 Subject: [PATCH] Fix placeholder not shown after launch again This issue is regressed by [1]. When we verify if the container is top active container, we should filter out the case that the Activity is not in TaskFragmentContainer. fixes: 224431790 Test: manual - test steps mentioned in bug [1]: 3d419be76f1c17fd8adc9d8ac7d7e63af461152b Change-Id: Iae3b2b903bf15448d429b8edd25ceeef97e74738 --- .../androidx/window/extensions/embedding/SplitController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1d2b9384f47df..2aa695346c895 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java @@ -501,7 +501,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen final TaskFragmentContainer container = getContainerWithActivity( activity.getActivityToken()); // Don't launch placeholder if the container is occluded. - if (container != getTopActiveContainer()) { + if (container != null && container != getTopActiveContainer()) { return false; }