diff options
| author | 2015-07-08 23:45:36 +0000 | |
|---|---|---|
| committer | 2015-07-08 23:45:36 +0000 | |
| commit | 1fee5522b60d9c24c9b30b5c995e72df191f7d50 (patch) | |
| tree | 83625f76afa8a377dc851ffff538a4cca95bf5b2 | |
| parent | 435c4013f5c26d380dbb3360c3958b37796ff3c1 (diff) | |
| parent | dad62b9f993b95bb9a0c20d29c69d35bd7531008 (diff) | |
am dad62b9f: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev
* commit 'dad62b9f993b95bb9a0c20d29c69d35bd7531008':
Finish already paused activity if it should be finished after pausing
| -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 |