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

Merge "Allow pinned activities to finish immediately" into nyc-dev

Browse Source 
am: 64ca270600

* commit '64ca2706000264b4f49f1e9f9566b69f0ce8b5a0':
  Allow pinned activities to finish immediately

Change-Id: I24189dd50d90e566e77f5ca77f42c391a9be4a5e
This commit is contained in:
Wale Ogunwale
2016-05-02 20:20:26 +00:00
committed by android-build-merger
parent 8f9c844b47 64ca270600
commit 820fec2283
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3488,11 +3488,10 @@ final class ActivityStack {
r.state = ActivityState.FINISHING;
if (mode == FINISH_IMMEDIATELY
|| (mode == FINISH_AFTER_PAUSE && prevState == ActivityState.PAUSED)
|| (prevState == ActivityState.PAUSED
&& (mode == FINISH_AFTER_PAUSE || mStackId == PINNED_STACK_ID))
|| prevState == ActivityState.STOPPED
|| prevState == ActivityState.INITIALIZING) {
// If this activity is already stopped, we can just finish
// it right now.
r.makeFinishingLocked();
boolean activityRemoved = destroyActivityLocked(r, true, "finish-imm");
if (activityRemoved) {