Merge "Fix placeholder not shown after launch again" into tm-dev
This commit is contained in:
@@ -501,7 +501,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen
|
|||||||
final TaskFragmentContainer container = getContainerWithActivity(
|
final TaskFragmentContainer container = getContainerWithActivity(
|
||||||
activity.getActivityToken());
|
activity.getActivityToken());
|
||||||
// Don't launch placeholder if the container is occluded.
|
// Don't launch placeholder if the container is occluded.
|
||||||
if (container != getTopActiveContainer()) {
|
if (container != null && container != getTopActiveContainer()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user