From 809120016c599ba5eae942a955151dbb1f4a5bcd Mon Sep 17 00:00:00 2001
From: Alan Stokes <alanstokes@google.com>
Date: Tue, 29 Oct 2019 14:53:23 +0000
Subject: [PATCH] Avoid a potential NPE.

Test: atest ActivityLifecycleSplitScreenTests
Bug: 142345211
Change-Id: Iad8dcfa8aa2cfdbe5f36d7747d1b7421abe27921
---
 services/core/java/com/android/server/wm/ActivityStarter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java
index ff0dc54f86b1d..f87175de1d061 100644
--- 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);