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

Merge "Revert "Avoid creating new instance on top when started for resu..."" into rvc-dev

Browse Source
This commit is contained in:
Daniel Chapin
2020-02-27 00:48:31 +00:00
committed by Android (Google) Code Review
parent cc6101236a de8fadecbb
commit e44eb5b955
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1819,7 +1819,7 @@ class ActivityStarter {
*/ */
private int deliverToCurrentTopIfNeeded(ActivityStack topStack) { private int deliverToCurrentTopIfNeeded(ActivityStack topStack) {
final ActivityRecord top = topStack.topRunningNonDelayedActivityLocked(mNotTop); final ActivityRecord top = topStack.topRunningNonDelayedActivityLocked(mNotTop);
final boolean dontStart = top != null final boolean dontStart = top != null && mStartActivity.resultTo == null
&& top.mActivityComponent.equals(mStartActivity.mActivityComponent) && top.mActivityComponent.equals(mStartActivity.mActivityComponent)
&& top.mUserId == mStartActivity.mUserId && top.mUserId == mStartActivity.mUserId
&& top.attachedToProcess() && top.attachedToProcess()
@@ -2055,6 +2055,8 @@ class ActivityStarter {
&& !isLaunchModeOneOf(LAUNCH_SINGLE_TASK, LAUNCH_SINGLE_INSTANCE) && !isLaunchModeOneOf(LAUNCH_SINGLE_TASK, LAUNCH_SINGLE_INSTANCE)
&& (mLaunchFlags & FLAG_ACTIVITY_NEW_DOCUMENT) != 0; && (mLaunchFlags & FLAG_ACTIVITY_NEW_DOCUMENT) != 0;
sendNewTaskResultRequestIfNeeded();
if ((mLaunchFlags & FLAG_ACTIVITY_NEW_DOCUMENT) != 0 && r.resultTo == null) { if ((mLaunchFlags & FLAG_ACTIVITY_NEW_DOCUMENT) != 0 && r.resultTo == null) {
mLaunchFlags |= FLAG_ACTIVITY_NEW_TASK; mLaunchFlags |= FLAG_ACTIVITY_NEW_TASK;
} }
@@ -2236,8 +2238,6 @@ class ActivityStarter {
mLaunchFlags |= FLAG_ACTIVITY_NEW_TASK; mLaunchFlags |= FLAG_ACTIVITY_NEW_TASK;
} }
} }
sendNewTaskResultRequestIfNeeded();
} }
private void computeSourceStack() { private void computeSourceStack() {