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 
am: 697a3334

* commit '697a3334854da5c2c3830f0489a0e7e4c646a7fb':
  Do not add duplicates to mWaitingVisibleActivities

Change-Id: I2eb3d4300913377a3a654d3d5ddfc8e8ea9f6c91
This commit is contained in:
Chong Zhang
2016-04-28 03:32:09 +00:00
committed by android-build-merger
parent f848873512 697a333485
commit 50165901a7
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.setAppVisibility(r.appToken, false);
mWindowManager.executeAppTransition();
mStackSupervisor.mWaitingVisibleActivities.add(r);
if (!mStackSupervisor.mWaitingVisibleActivities.contains(r)) {
mStackSupervisor.mWaitingVisibleActivities.add(r);
}
}
return finishCurrentActivityLocked(r, (r.visible || r.nowVisible) ?
FINISH_AFTER_VISIBLE : FINISH_AFTER_PAUSE, oomAdj) == null;