Merge "Avoid a potential NPE."

2019-10-30 06:30:19 +00:00
parent e12235039e 809120016c
commit 4eaacb257f
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/ActivityStarter.java
+++ b/services/core/java/com/android/server/wm/ActivityStarter.java
@@ -2354,7 +2354,7 @@ class ActivityStarter {
                    mMovedToFront = true;
                }

-                if (launchStack.topTask() == null) {
+                if (launchStack != null && launchStack.topTask() == null) {
                    // The task does not need to be reparented to the launch stack. Remove the
                    // launch stack if there is no activity in it.
                    Slog.w(TAG, "Removing an empty stack: " + launchStack);