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

am d91f9c7e: am 6ede9b67: am 26b0f1e4: Merge "Revert "Finish already paused activity if it should be finished after pausing"" into mnc-dev

Browse Source 
* commit 'd91f9c7e996241060a7503461e44e4e6787611dd':
  Revert "Finish already paused activity if it should be finished after pausing"
This commit is contained in:
Wale Ogunwale
2015-07-14 00:20:21 +00:00
committed by Android Git Automerger
parent dc7368cb85 d91f9c7e99
commit bdd89eed37
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/core/java/com/android/server/am/ActivityStack.java
View File

@@ -2963,7 +2963,6 @@ final class ActivityStack {
r.state = ActivityState.FINISHING; r.state = ActivityState.FINISHING;
if (mode == FINISH_IMMEDIATELY if (mode == FINISH_IMMEDIATELY
|| (mode == FINISH_AFTER_PAUSE && prevState == ActivityState.PAUSED)
|| prevState == ActivityState.STOPPED || prevState == ActivityState.STOPPED
|| prevState == ActivityState.INITIALIZING) { || prevState == ActivityState.INITIALIZING) {
// If this activity is already stopped, we can just finish // If this activity is already stopped, we can just finish