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

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

am a78d9a24: Merge "Reset activity\'s "return to home" flag on relaunch" into klp-dev 

* commit 'a78d9a24':
  Reset activity's "return to home" flag on relaunch
parents 10581450 a78d9a24

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

+3 −2
Original line number Diff line number Diff line
@@ -1426,8 +1426,7 @@ public final class ActivityStackSupervisor { 
                            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, so before starting

                                // their own activity we will bring home to the front.

                                // Caller wants to appear on home activity.

                                r.mLaunchHomeTaskNext = true;

                            }

                            targetStack.moveTaskToFrontLocked(intentActivity.task, r, options);
@@ -1541,6 +1540,8 @@ public final class ActivityStackSupervisor { 
                        // don't use that intent!)  And for paranoia, make

                        // sure we have correctly resumed the top activity.

                        if (doResume) {

                            // Reset flag so it gets correctly reevaluated.

                            intentActivity.mLaunchHomeTaskNext = false;

                            setLaunchHomeTaskNextFlag(sourceRecord, intentActivity, targetStack);

                            targetStack.resumeTopActivityLocked(null, options);

                        } else {