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

Commit 48db56c0 authored by Winson Chung's avatar Winson Chung Committed by android-build-merger
Browse files

Merge "Fix NPE when deciding whether to defer task stack animation." into pi-dev am: 8faa90be 

am: 94b669c6

Change-Id: I01ac013bdbe72a0da1eef0a097a56efaa608daa2
parents 679b2185 94b669c6

services/core/java/com/android/server/wm/TaskStack.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -1722,6 +1722,9 @@ public class TaskStack extends WindowContainer<Task> implements 
            return true;

            return true;

        }

        }

        final Task homeTask = homeStack.getTopChild();

        final Task homeTask = homeStack.getTopChild();

        if (homeTask == null) {

            return true;

        }

        final AppWindowToken homeApp = homeTask.getTopVisibleAppToken();

        final AppWindowToken homeApp = homeTask.getTopVisibleAppToken();

        if (!homeTask.isVisible() || homeApp == null) {

        if (!homeTask.isVisible() || homeApp == null) {

            return true;

            return true;