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

Commit 2e98a5fe authored by Bryce Lee's avatar Bryce Lee Committed by android-build-merger
Browse files

Merge "Check for source activity's task presence before referencing." into oc-dev am: cdb7e6d5

am: 8efb2573

Change-Id: Ied0c5e678f989c77e17a8fa0847b6cdd683abb52
parents 2e0283a7 8efb2573
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -1432,7 +1432,13 @@ class ActivityStarter {
                    + "; forcing " + "Intent.FLAG_ACTIVITY_NEW_TASK for: " + mIntent);
            mLaunchFlags |= FLAG_ACTIVITY_NEW_TASK;
            mNewTaskInfo = mSourceRecord.info;
            mNewTaskIntent = mSourceRecord.getTask().intent;

            // It is not guaranteed that the source record will have a task associated with it. For,
            // example, if this method is being called for processing a pending activity launch, it
            // is possible that the activity has been removed from the task after the launch was
            // enqueued.
            final TaskRecord sourceTask = mSourceRecord.getTask();
            mNewTaskIntent = sourceTask != null ? sourceTask.intent : null;
        }
        mSourceRecord = null;
        mSourceStack = null;