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

Commit f65dd213 authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am 2534c16b: am dfe0d9a0: Merge "Change order of operations so flag is not... 

am 2534c16b: am dfe0d9a0: Merge "Change order of operations so flag is not overwritten" into klp-dev

* commit '2534c16b':
  Change order of operations so flag is not overwritten
parents 5894e737 2534c16b

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;

                        }

                    }