From bef8a3e39372ca85104b894f7359deddc97a8fec Mon Sep 17 00:00:00 2001 From: Wale Ogunwale Date: Wed, 8 Jul 2015 14:19:44 -0700 Subject: [PATCH] Finish already paused activity if it should be finished after pausing If the app requests its activity to be finished allow it to be finished immediately if the activity is already paused. Bug: 22170595 Change-Id: I1ecc0d5f3b85fd80cbe8cdc1d4e32d5c6a50b20c --- services/core/java/com/android/server/am/ActivityStack.java | 1 + 1 file changed, 1 insertion(+) diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index 8c3a9508922dc..31cdcd51aff9e 100644 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -2963,6 +2963,7 @@ final class ActivityStack { r.state = ActivityState.FINISHING; if (mode == FINISH_IMMEDIATELY + || (mode == FINISH_AFTER_PAUSE && prevState == ActivityState.PAUSED) || prevState == ActivityState.STOPPED || prevState == ActivityState.INITIALIZING) { // If this activity is already stopped, we can just finish