Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50165901 authored by Chong Zhang's avatar Chong Zhang Committed by android-build-merger
Browse files

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

am: 697a3334

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

Change-Id: I2eb3d4300913377a3a654d3d5ddfc8e8ea9f6c91
parents f8488735 697a3334

services/core/java/com/android/server/am/ActivityStack.java

+3 −1
Original line number Diff line number Diff line
@@ -3438,8 +3438,10 @@ final class ActivityStack { 
                mWindowManager.prepareAppTransition(transit, false);

                mWindowManager.setAppVisibility(r.appToken, false);

                mWindowManager.executeAppTransition();

                if (!mStackSupervisor.mWaitingVisibleActivities.contains(r)) {

                    mStackSupervisor.mWaitingVisibleActivities.add(r);

                }

            }

            return finishCurrentActivityLocked(r, (r.visible || r.nowVisible) ?

                    FINISH_AFTER_VISIBLE : FINISH_AFTER_PAUSE, oomAdj) == null;

        } else {