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

Merge changes from topic "presubmit-am-e095dcb8dc634f1bbc080231db8e0ba1" into sc-qpr1-dev

Browse Source 
* changes:
  [automerge] [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied 2p: 7af50c4d5f
  [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied
This commit is contained in:
TreeHugger Robot
2022-09-26 01:25:55 +00:00
committed by Android (Google) Code Review
parent e6d0a468f9 c30420a5cf
commit 40b5a52b49
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/ResetTargetTaskHelper.java
View File

@@ -146,15 +146,16 @@ class ResetTargetTaskHelper {
return false; return false;
} else { } else {
mResultActivities.add(r);
if (r.resultTo != null) { if (r.resultTo != null) {
// If this activity is sending a reply to a previous activity, we can't do // If this activity is sending a reply to a previous activity, we can't do
// anything with it now until we reach the start of the reply chain. // anything with it now until we reach the start of the reply chain.
// NOTE: that we are assuming the result is always to the previous activity, // NOTE: that we are assuming the result is always to the previous activity,
// which is almost always the case but we really shouldn't count on. // which is almost always the case but we really shouldn't count on.
mResultActivities.add(r);
return false; return false;
} else if (mTargetTaskFound && allowTaskReparenting && mTargetTask.affinity != null } else if (mTargetTaskFound && allowTaskReparenting && mTargetTask.affinity != null
&& mTargetTask.affinity.equals(r.taskAffinity)) { && mTargetTask.affinity.equals(r.taskAffinity)) {
mResultActivities.add(r);
// This activity has an affinity for our task. Either remove it if we are // This activity has an affinity for our task. Either remove it if we are
// clearing or move it over to our task. Note that we currently punt on the case // clearing or move it over to our task. Note that we currently punt on the case
// where we are resetting a task that is not at the top but who has activities // where we are resetting a task that is not at the top but who has activities