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

Merge "Fixes re-setting activity type when embed activity in split-screen" into sc-v2-dev am: 35eaf77b5d

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

Change-Id: I45bacbdb4cd7b4129928bbc8f6b0ee1362ec4736
This commit is contained in:
Louis Chang
2021-12-07 14:26:34 +00:00
committed by Automerger Merge Worker
parent 6095e223cf 35eaf77b5d
commit e1f231760f
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/Task.java
View File

@@ -1454,11 +1454,11 @@ class Task extends TaskFragment {
} }
/** Called when an {@link ActivityRecord} is added as a descendant */ /** Called when an {@link ActivityRecord} is added as a descendant */
void onDescendantActivityAdded(boolean hadChild, int activityType, ActivityRecord r) { void onDescendantActivityAdded(boolean hadActivity, int activityType, ActivityRecord r) {
warnForNonLeafTask("onDescendantActivityAdded"); warnForNonLeafTask("onDescendantActivityAdded");
// Only set this based on the first activity // Only set this based on the first activity
if (!hadChild) { if (!hadActivity) {
if (r.getActivityType() == ACTIVITY_TYPE_UNDEFINED) { if (r.getActivityType() == ACTIVITY_TYPE_UNDEFINED) {
// Normally non-standard activity type for the activity record will be set when the // Normally non-standard activity type for the activity record will be set when the
// object is created, however we delay setting the standard application type until // object is created, however we delay setting the standard application type until

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

@@ -102,6 +102,7 @@ import java.io.FileDescriptor;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Function; import java.util.function.Function;
@@ -1670,8 +1671,8 @@ class TaskFragment extends WindowContainer<WindowContainer> {
boolean isAddingActivity = child.asActivityRecord() != null; boolean isAddingActivity = child.asActivityRecord() != null;
final Task task = isAddingActivity ? getTask() : null; final Task task = isAddingActivity ? getTask() : null;
// If this task had any child before we added this one. // If this task had any activity before we added this one.
boolean taskHadChild = task != null && task.hasChild(); boolean taskHadActivity = task != null && task.getActivity(Objects::nonNull) != 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;
@@ -1680,7 +1681,7 @@ class TaskFragment extends WindowContainer<WindowContainer> {
if (isAddingActivity && task != null) { if (isAddingActivity && task != null) {
child.asActivityRecord().inHistory = true; child.asActivityRecord().inHistory = true;
task.onDescendantActivityAdded(taskHadChild, activityType, child.asActivityRecord()); task.onDescendantActivityAdded(taskHadActivity, activityType, child.asActivityRecord());
} }
} }