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
This commit is contained in:
TreeHugger Robot
2016-05-02 20:10:36 +00:00
committed by Android (Google) Code Review
parent 180aa65e20 ae30f308ee
commit 64ca270600
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; r.state = ActivityState.FINISHING;
if (mode == FINISH_IMMEDIATELY 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.STOPPED
|| prevState == ActivityState.INITIALIZING) { || prevState == ActivityState.INITIALIZING) {
// If this activity is already stopped, we can just finish
// it right now.
r.makeFinishingLocked(); r.makeFinishingLocked();
boolean activityRemoved = destroyActivityLocked(r, true, "finish-imm"); boolean activityRemoved = destroyActivityLocked(r, true, "finish-imm");
if (activityRemoved) { if (activityRemoved) {