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 
am: 98afb34

* commit '98afb342df74a657e69a478b5ace19450b579660':
  Wait for next app to be visible if current activity is marked visible

Change-Id: I6fa1dd67f8bff23596277d3c55869961ffa6b220
This commit is contained in:
Chong Zhang
2016-04-25 21:26:57 +00:00
committed by android-build-merger
parent 1dba322b85 98afb342df
commit 86461e692e
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,
// and the resumed activity is not yet visible, then hold off on
// 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)) {
addToStopping(r, false /* immediate */);
}