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

Commit dfe0d9a0 authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Change order of operations so flag is not overwritten" into klp-dev

parents 334d98f1 b53d97c4

services/java/com/android/server/am/ActivityStackSupervisor.java

+1 −1
Original line number Diff line number Diff line
@@ -1471,13 +1471,13 @@ public final class ActivityStackSupervisor { 
                            // We really do want to push this one into the

                            // user's face, right now.

                            movedHome = true;

                            targetStack.moveTaskToFrontLocked(intentActivity.task, r, options);

                            if ((launchFlags &

                                    (FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_TASK_ON_HOME))

                                    == (FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_TASK_ON_HOME)) {

                                // Caller wants to appear on home activity.

                                intentActivity.task.mOnTopOfHome = true;

                            }

                            targetStack.moveTaskToFrontLocked(intentActivity.task, r, options);

                            options = null;

                        }

                    }