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

Commit aaebbbff authored by Alexandra Gherghina's avatar Alexandra Gherghina Committed by Android (Google) Code Review
Browse files

Merge "Check for empty activity stack. This avoids a null pointer exception... 

Merge "Check for empty activity stack. This avoids a null pointer exception when switching from an user with no open apps."
parents e13cf570 dae57a14

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

+8 −2
Original line number Diff line number Diff line
@@ -2469,7 +2469,10 @@ public final class ActivityStackSupervisor implements DisplayListener { 
            for (int stackNdx = stacks.size() - 1; stackNdx >= 0; --stackNdx) {

                final ActivityStack stack = stacks.get(stackNdx);

                stack.switchUserLocked(userId);

                mWindowManager.moveTaskToTop(stack.topTask().taskId);

                TaskRecord task = stack.topTask();

                if (task != null) {

                    mWindowManager.moveTaskToTop(task.taskId);

                }

            }

        }
@@ -2480,7 +2483,10 @@ public final class ActivityStackSupervisor implements DisplayListener { 
        final boolean homeInFront = stack.isHomeStack();

        if (stack.isOnHomeDisplay()) {

            moveHomeStack(homeInFront);

            mWindowManager.moveTaskToTop(stack.topTask().taskId);

            TaskRecord task = stack.topTask();

            if (task != null) {

                mWindowManager.moveTaskToTop(task.taskId);

            }

        } else {

            // Stack was moved to another display while user was swapped out.

            resumeHomeActivity(null);