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

Commit 9292ee75 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in ActivityStack.ensureActivitiesVisibleLocked"

parents e6c2b502 86dde2bd

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

+2 −1
Original line number Diff line number Diff line
@@ -1817,7 +1817,8 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai 
            boolean behindFullscreenActivity = !stackShouldBeVisible;

            boolean resumeNextActivity = mStackSupervisor.isFocusedStack(this)

                    && (isInStackLocked(starting) == null);

            final boolean isTopNotPinnedStack = getDisplay().isTopNotPinnedStack(this);

            final boolean isTopNotPinnedStack =

                    isAttached() && getDisplay().isTopNotPinnedStack(this);

            for (int taskNdx = mTaskHistory.size() - 1; taskNdx >= 0; --taskNdx) {

                final TaskRecord task = mTaskHistory.get(taskNdx);

                final ArrayList<ActivityRecord> activities = task.mActivities;