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

Commit cdc0ddca authored by Wale Ogunwale's avatar Wale Ogunwale
Browse files

Fixed NPE in ActivityStarter.updateTaskReturnToType() 

Bug: 30834977
Test: Manual testing of condition in bug.
Change-Id: I4b46a380fa0b52d983965dfb056b461c53afcd05
parent fb3d63ee

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

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


    private void updateTaskReturnToType(

            TaskRecord task, int launchFlags, ActivityStack focusedStack) {

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

                focusedStack.topTask().isOnTopLauncher()) {

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

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

            // 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.

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