Merge "Fix for activity manager crash due to null task" into nyc-dev

am: c9039e0

* commit 'c9039e05eab7ce3a2fcc0a05c88d4da492129579':
  Fix for activity manager crash due to null task

Change-Id: If3c133994598ac64a1cd806fa1c97c7524de42d1

services/core/java/com/android/server/am/ActivityStarter.java

@@ -986,8 +986,12 @@ class ActivityStarter {
             }
             top.deliverNewIntentLocked(
                     mCallingUid, mStartActivity.intent, mStartActivity.launchedFromPackage);
-            mSupervisor.handleNonResizableTaskIfNeeded(mStartActivity.task,
-                    preferredLaunchStackId, topStack.mStackId);
+
+            // Don't use mStartActivity.task to show the toast. We're not starting a new activity
+            // but reusing 'top'. Fields in mStartActivity may not be fully initialized.
+            mSupervisor.handleNonResizableTaskIfNeeded(
+                    top.task, preferredLaunchStackId, topStack.mStackId);
+
             return START_DELIVERED_TO_TOP;
         }