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

Commit 0b23e20b authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Add null check" into lmp-dev

parents 2bb7e341 3b1dac8c

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

+5 −2
Original line number Diff line number Diff line
@@ -1840,8 +1840,11 @@ final class ActivityStack { 
            ActivityStack lastStack = mStackSupervisor.getLastStack();

            final boolean fromHome = lastStack.isHomeStack();

            if (!isHomeStack() && (fromHome || topTask() != task)) {

                task.setTaskToReturnTo(fromHome ?

                        lastStack.topTask().taskType : APPLICATION_ACTIVITY_TYPE);

                task.setTaskToReturnTo(fromHome

                        ? lastStack.topTask() == null

                                ? HOME_ACTIVITY_TYPE

                                : lastStack.topTask().taskType

                        : APPLICATION_ACTIVITY_TYPE);

            }

        } else {

            task.setTaskToReturnTo(APPLICATION_ACTIVITY_TYPE);