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

Merge "Do not add duplicates to mWaitingVisibleActivities" into nyc-dev

Browse Source
This commit is contained in:
Chong Zhang
2016-04-28 03:25:48 +00:00
committed by Android (Google) Code Review
parent 74610328f3 b8bd069eac
commit 697a333485
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3438,7 +3438,9 @@ final class ActivityStack {
mWindowManager.prepareAppTransition(transit, false); mWindowManager.prepareAppTransition(transit, false);
mWindowManager.setAppVisibility(r.appToken, false); mWindowManager.setAppVisibility(r.appToken, false);
mWindowManager.executeAppTransition(); mWindowManager.executeAppTransition();
mStackSupervisor.mWaitingVisibleActivities.add(r); if (!mStackSupervisor.mWaitingVisibleActivities.contains(r)) {
mStackSupervisor.mWaitingVisibleActivities.add(r);
}
} }
return finishCurrentActivityLocked(r, (r.visible || r.nowVisible) ? return finishCurrentActivityLocked(r, (r.visible || r.nowVisible) ?
FINISH_AFTER_VISIBLE : FINISH_AFTER_PAUSE, oomAdj) == null; FINISH_AFTER_VISIBLE : FINISH_AFTER_PAUSE, oomAdj) == null;