Merge "Update task-on-home flag to task for every activity launch"

import static android.content.Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED;

import static android.content.Intent.FLAG_ACTIVITY_RETAIN_IN_RECENTS;

import static android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP;

import static android.content.Intent.FLAG_ACTIVITY_TASK_ON_HOME;

import static android.content.pm.ActivityInfo.DOCUMENT_LAUNCH_ALWAYS;

import static android.content.pm.ActivityInfo.LAUNCH_MULTIPLE;

import static android.content.pm.ActivityInfo.LAUNCH_SINGLE_INSTANCE;

                // This task was started because of movement of the activity based on affinity...

                // Now that we are actually launching it, we can assign the base intent.

                reusedActivity.getTaskRecord().setIntent(mStartActivity);

            } else {

                final boolean taskOnHome =

                        (mStartActivity.intent.getFlags() & FLAG_ACTIVITY_TASK_ON_HOME) != 0;

                if (taskOnHome) {

                    reusedActivity.getTaskRecord().intent.addFlags(FLAG_ACTIVITY_TASK_ON_HOME);

                } else {

                    reusedActivity.getTaskRecord().intent.removeFlags(FLAG_ACTIVITY_TASK_ON_HOME);

                }

            }

            // This code path leads to delivering a new intent, we want to make sure we schedule it