Merge "Add null check when determining mOnTopOfHome" into klp-dev

1 files changed, 3 insertions, 1 deletions

diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java
index 20d443b51f7a..596e18a80244 100644
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -1629,10 +1629,12 @@ final class ActivityStack {
     private void insertTaskAtTop(TaskRecord task) {
         // If this is being moved to the top by another activity or being launched from the home
         // activity, set mOnTopOfHome accordingly.
-        final boolean fromHome = mStackSupervisor.getLastStack().isHomeStack();
+        ActivityStack lastStack = mStackSupervisor.getLastStack();
+        final boolean fromHome = lastStack == null ? true : lastStack.isHomeStack();
         if (!isHomeStack() && (fromHome || topTask() != task)) {
             task.mOnTopOfHome = fromHome;
         }
+
         mTaskHistory.remove(task);
         // Now put task at top.
         int stackNdx = mTaskHistory.size();