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

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

am e2c92ac8: Merge "Update launchFlags after changing Intent flags" into lmp-preview-dev 

* commit 'e2c92ac847d151cbf4d578ee85d3ff10126e9ada':
  Update launchFlags after changing Intent flags
parents 83ea195b bf1bf9de

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

+5 −2
Original line number Diff line number Diff line
@@ -1499,7 +1499,8 @@ public final class ActivityStackSupervisor implements DisplayListener { 
            r.delayedResume = true;

        }



        ActivityRecord notTop = (launchFlags&Intent.FLAG_ACTIVITY_PREVIOUS_IS_TOP) != 0 ? r : null;

        ActivityRecord notTop =

                (launchFlags & Intent.FLAG_ACTIVITY_PREVIOUS_IS_TOP) != 0 ? r : null;



        // If the onlyIfNeeded flag is set, then we can do this if the activity

        // being launched is the same as the one making the call...  or, as
@@ -1522,9 +1523,11 @@ public final class ActivityStackSupervisor implements DisplayListener { 
            case ActivityInfo.DOCUMENT_LAUNCH_ALWAYS:

                intent.addFlags(

                        Intent.FLAG_ACTIVITY_NEW_DOCUMENT | Intent.FLAG_ACTIVITY_MULTIPLE_TASK);

                launchFlags = intent.getFlags();

                break;

            case ActivityInfo.DOCUMENT_LAUNCH_INTO_EXISTING:

                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);

                launchFlags = intent.getFlags();

                break;

        }

        final boolean newDocument = intent.isDocument();