Merge "Fixes un-setting activity type when embed activity in split-screen" into tm-dev

2022-04-28 04:50:45 +00:00
parent 5a7dafba62 e79a02435d
commit 0fb7a12804
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/TaskFragment.java
+++ b/services/core/java/com/android/server/wm/TaskFragment.java
@@ -2156,7 +2156,8 @@ class TaskFragment extends WindowContainer<WindowContainer> {
        if (applicationType != ACTIVITY_TYPE_UNDEFINED || !hasChild()) {
            return applicationType;
        }
-        return getTopChild().getActivityType();
+        final ActivityRecord activity = getTopNonFinishingActivity();
+        return activity != null ? activity.getActivityType() : getTopChild().getActivityType();
    }

    @Override