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

Merge "Return the activity type of any child activity in the Task" into tm-dev am: 2b8d1c3548

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

Change-Id: I27d53223682799a2e1d67bceb57d17e8114099d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Louis Chang
2022-05-24 07:46:04 +00:00
committed by Automerger Merge Worker
parent 8437930504 2b8d1c3548
commit d965aa4123
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,7 +103,6 @@ import java.io.PrintWriter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Predicate; import java.util.function.Predicate;
@@ -1758,7 +1757,7 @@ class TaskFragment extends WindowContainer<WindowContainer> {
final Task task = isAddingActivity ? getTask() : null; final Task task = isAddingActivity ? getTask() : null;
// If this task had any activity before we added this one. // If this task had any activity before we added this one.
boolean taskHadActivity = task != null && task.getActivity(Objects::nonNull) != null; boolean taskHadActivity = task != null && task.getTopMostActivity() != null;
// getActivityType() looks at the top child, so we need to read the type before adding // getActivityType() looks at the top child, so we need to read the type before adding
// a new child in case the new child is on top and UNDEFINED. // a new child in case the new child is on top and UNDEFINED.
final int activityType = task != null ? task.getActivityType() : ACTIVITY_TYPE_UNDEFINED; final int activityType = task != null ? task.getActivityType() : ACTIVITY_TYPE_UNDEFINED;
@@ -2171,7 +2170,7 @@ class TaskFragment extends WindowContainer<WindowContainer> {
if (applicationType != ACTIVITY_TYPE_UNDEFINED || !hasChild()) { if (applicationType != ACTIVITY_TYPE_UNDEFINED || !hasChild()) {
return applicationType; return applicationType;
} }
final ActivityRecord activity = getTopNonFinishingActivity(); final ActivityRecord activity = getTopMostActivity();
return activity != null ? activity.getActivityType() : getTopChild().getActivityType(); return activity != null ? activity.getActivityType() : getTopChild().getActivityType();
} }