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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2022-04-28 04:50:45 +00:00
committed by Android (Google) Code Review
parent 5a7dafba62 e79a02435d
commit 0fb7a12804
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/TaskFragment.java
View File

@@ -2156,7 +2156,8 @@ class TaskFragment extends WindowContainer<WindowContainer> {
if (applicationType != ACTIVITY_TYPE_UNDEFINED || !hasChild()) { if (applicationType != ACTIVITY_TYPE_UNDEFINED || !hasChild()) {
return applicationType; return applicationType;
} }
return getTopChild().getActivityType(); final ActivityRecord activity = getTopNonFinishingActivity();
return activity != null ? activity.getActivityType() : getTopChild().getActivityType();
} }
@Override @Override