diff options
| author | 2015-07-08 23:34:29 +0000 | |
|---|---|---|
| committer | 2015-07-08 23:34:31 +0000 | |
| commit | dad62b9f993b95bb9a0c20d29c69d35bd7531008 (patch) | |
| tree | f8b260ffb16a86e50d48f48e9189b4b686dc31d3 | |
| parent | 9f4c4ee66632e1355afa1218021ed728a99f7415 (diff) | |
| parent | bef8a3e39372ca85104b894f7359deddc97a8fec (diff) | |
Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStack.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index 8c3a9508922d..31cdcd51aff9 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 |