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 am: 0fb7a12804

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17800405

Change-Id: I7f40736a5420c5fc55a8cadc382709f040fc5160
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-04-28 05:20:13 +00:00
committed by Automerger Merge Worker
parent 1108d2259a 0fb7a12804
commit 31918e910d
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()) {
return applicationType;
}
return getTopChild().getActivityType();
final ActivityRecord activity = getTopNonFinishingActivity();
return activity != null ? activity.getActivityType() : getTopChild().getActivityType();
}
@Override