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

Commit 23d4edde authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am ea7c1e24: Merge "Add null check when determining mOnTopOfHome" into klp-dev

* commit 'ea7c1e24':
  Add null check when determining mOnTopOfHome
parents c61b90f0 ea7c1e24
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -1629,10 +1629,12 @@ final class ActivityStack {
    private void insertTaskAtTop(TaskRecord task) {
        // If this is being moved to the top by another activity or being launched from the home
        // activity, set mOnTopOfHome accordingly.
        final boolean fromHome = mStackSupervisor.getLastStack().isHomeStack();
        ActivityStack lastStack = mStackSupervisor.getLastStack();
        final boolean fromHome = lastStack == null ? true : lastStack.isHomeStack();
        if (!isHomeStack() && (fromHome || topTask() != task)) {
            task.mOnTopOfHome = fromHome;
        }

        mTaskHistory.remove(task);
        // Now put task at top.
        int stackNdx = mTaskHistory.size();