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

Commit 7e663c03 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 3a2bc1eb on remote branch 

Change-Id: I938806881516276746b89d8359a7f6913d263ceb
parents 2d6f3805 3a2bc1eb

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

+1 −6
Original line number Diff line number Diff line
@@ -1016,12 +1016,7 @@ final class ActivityStack { 
                } else if (!hasVisibleBehindActivity()) {

                    // If we were visible then resumeTopActivities will release resources before

                    // stopping.

                    ActivityRecord top = topRunningActivityLocked(null);

                    if (top != null && top.equals(prev) && mService.isSleepingOrShuttingDown()){

                        Slog.d(TAG, "Top activity keeps the pause sate. top : "+top);

                    } else {

                    mStackSupervisor.mStoppingActivities.add(prev);

                    }

                    if (mStackSupervisor.mStoppingActivities.size() > 3 ||

                            prev.frontOfTask && mTaskHistory.size() <= 1) {

                        // If we already have a few activities waiting to stop,