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

Merge "Don't wait for visible if there is no running activity left." into nyc-dev

Browse Source
This commit is contained in:
Chong Zhang
2016-04-28 03:40:59 +00:00
committed by Android (Google) Code Review
parent 697a333485 824b6dcb55
commit 103fdec415
1 changed files with 4 additions and 1 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

@@ -3459,8 +3459,11 @@ final class ActivityStack {
// First things first: if this activity is currently visible, // First things first: if this activity is currently visible,
// and the resumed activity is not yet visible, then hold off on // and the resumed activity is not yet visible, then hold off on
// finishing until the resumed one becomes visible. // finishing until the resumed one becomes visible.
final ActivityRecord next = mStackSupervisor.topRunningActivityLocked();
if (mode == FINISH_AFTER_VISIBLE && (r.visible || r.nowVisible) if (mode == FINISH_AFTER_VISIBLE && (r.visible || r.nowVisible)
&& !mStackSupervisor.allResumedActivitiesVisible()) { && next != null && !next.nowVisible) {
if (!mStackSupervisor.mStoppingActivities.contains(r)) { if (!mStackSupervisor.mStoppingActivities.contains(r)) {
addToStopping(r, false /* immediate */); addToStopping(r, false /* immediate */);
} }