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

Merge "Wait for next app to be visible if current activity is marked visible" into nyc-dev

Browse Source
This commit is contained in:
Chong Zhang
2016-04-25 21:13:27 +00:00
committed by Android (Google) Code Review
parent df89cd1b39 592bf0b7d5
commit 98afb342df
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3457,7 +3457,7 @@ 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.
if (mode == FINISH_AFTER_VISIBLE && r.nowVisible) { if (mode == FINISH_AFTER_VISIBLE && (r.visible || r.nowVisible)) {
if (!mStackSupervisor.mStoppingActivities.contains(r)) { if (!mStackSupervisor.mStoppingActivities.contains(r)) {
addToStopping(r, false /* immediate */); addToStopping(r, false /* immediate */);
} }