Fix resumeWhilePausing not working
Activity was waiting for previous activity to be paused before
restarting, while the activity has FLAG_RESUME_WHILE_PAUSING set.
This behavior was broken after c2baac05 if the next top activity does
not have process attached. Ideally, the next top activity should be
restarted after process was bound, but it was postponed to wait for
all pausing activity completed.
Bring the check (whether need to immediately pause previous activity)
back and move it into AS#startPausing().
Bug: 120003748
Test: atest ActivityLifecycleTests PinnedStackTests ActivityStackTests
Change-Id: I067cb1ea6095816bb573a982c5b50605d1b6d077
diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index 8d40f87..ee56c09 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -87,7 +87,6 @@
import static com.android.server.wm.ActivityStack.REMOVE_TASK_MODE_DESTROYING;
import static com.android.server.wm.ActivityStackSupervisor.DEFER_RESUME;
import static com.android.server.wm.ActivityStackSupervisor.ON_TOP;
-import static com.android.server.wm.ActivityStackSupervisor.PAUSE_IMMEDIATELY;
import static com.android.server.wm.ActivityStackSupervisor.PRESERVE_WINDOWS;
import static com.android.server.wm.ActivityStackSupervisor.REMOVE_FROM_RECENTS;
import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_ALL;
@@ -1616,8 +1615,7 @@
// Explicitly dismissing the activity so reset its relaunch flag.
r.mRelaunchReason = RELAUNCH_REASON_NONE;
} else {
- r.finishIfPossible(resultCode, resultData, "app-request",
- true /* oomAdj */, !PAUSE_IMMEDIATELY);
+ r.finishIfPossible(resultCode, resultData, "app-request", true /* oomAdj */);
res = r.finishing;
if (!res) {
Slog.i(TAG, "Failed to finish by app-request");