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

Merge "Revert f714906c for startActivityForResult" into sc-dev

Browse Source
This commit is contained in:
Jeff Chang
2021-03-31 08:23:11 +00:00
committed by Android (Google) Code Review
parent fad1fea130 8c97862312
commit 6742af3acc
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1816,7 +1816,8 @@ class ActivityStarter {
} }
private Task computeTargetTask() { private Task computeTargetTask() {
if (mInTask == null && !mAddingToTask && (mLaunchFlags & FLAG_ACTIVITY_NEW_TASK) != 0) { if (mStartActivity.resultTo == null && mInTask == null && !mAddingToTask
&& (mLaunchFlags & FLAG_ACTIVITY_NEW_TASK) != 0) {
// A new task should be created instead of using existing one. // A new task should be created instead of using existing one.
return null; return null;
} else if (mSourceRecord != null) { } else if (mSourceRecord != null) {
@@ -2516,9 +2517,7 @@ class ActivityStarter {
// If bring to front is requested, and no result is requested and we have not been given // If bring to front is requested, and no result is requested and we have not been given
// an explicit task to launch in to, and we can find a task that was started with this // an explicit task to launch in to, and we can find a task that was started with this
// same component, then instead of launching bring that one to the front. // same component, then instead of launching bring that one to the front.
putIntoExistingTask &= !isLaunchModeOneOf(LAUNCH_SINGLE_INSTANCE, LAUNCH_SINGLE_TASK) putIntoExistingTask &= mInTask == null && mStartActivity.resultTo == null;
? (mInTask == null && mStartActivity.resultTo == null)
: (mInTask == null);
ActivityRecord intentActivity = null; ActivityRecord intentActivity = null;
if (putIntoExistingTask) { if (putIntoExistingTask) {
if (LAUNCH_SINGLE_INSTANCE == mLaunchMode) { if (LAUNCH_SINGLE_INSTANCE == mLaunchMode) {