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

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

Merge "Fixed NPE in ActivityStarter.updateTaskReturnToType()"

parents 972d866b cdc0ddca

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -1524,8 +1524,8 @@ class ActivityStarter { 




    private void updateTaskReturnToType(

    private void updateTaskReturnToType(

            TaskRecord task, int launchFlags, ActivityStack focusedStack) {

            TaskRecord task, int launchFlags, ActivityStack focusedStack) {

        if (focusedStack != null && focusedStack.isHomeStack() &&

        if (focusedStack != null && focusedStack.isHomeStack() && focusedStack.topTask() != null

                focusedStack.topTask().isOnTopLauncher()) {

                && focusedStack.topTask().isOnTopLauncher()) {

            // Since an on-top launcher will is moved to back when tasks are launched from it,

            // Since an on-top launcher will is moved to back when tasks are launched from it,

            // those tasks should first try to return to a non-home activity.

            // those tasks should first try to return to a non-home activity.

            // This also makes sure that non-home activities are visible under a transparent

            // This also makes sure that non-home activities are visible under a transparent