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

Commit 94b669c6 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

Change-Id: I6550076e6dd6ccb60e8b2c6537660155d2f2fe4a
parents 1b216d84 8faa90be

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

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

        }

        final Task homeTask = homeStack.getTopChild();

        if (homeTask == null) {

            return true;

        }

        final AppWindowToken homeApp = homeTask.getTopVisibleAppToken();

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

            return true;