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

Commit 58f94be3 authored by Patrick Baumann's avatar Patrick Baumann Committed by android-build-merger
Browse files

Merge "Adds a start flag to set FLAG_ACTIVITY_MATCH_EXTERNAL" into pi-dev am: 1a249607 

am: 30cb5926

Change-Id: I261e35dc7cc59988575fdfd095c3d75a18bc2e04
parents d2645f90 30cb5926

core/java/android/content/Intent.java

+4 −1
Original line number Diff line number Diff line
@@ -6810,6 +6810,9 @@ public class Intent implements Parcelable, Cloneable { 
                case "--activity-task-on-home":

                    intent.addFlags(Intent.FLAG_ACTIVITY_TASK_ON_HOME);

                    break;

                case "--activity-match-external":

                    intent.addFlags(Intent.FLAG_ACTIVITY_MATCH_EXTERNAL);

                    break;

                case "--receiver-registered-only":

                    intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);

                    break;
@@ -6946,7 +6949,7 @@ public class Intent implements Parcelable, Cloneable { 
                "    [--activity-no-user-action] [--activity-previous-is-top]",

                "    [--activity-reorder-to-front] [--activity-reset-task-if-needed]",

                "    [--activity-single-top] [--activity-clear-task]",

                "    [--activity-task-on-home]",

                "    [--activity-task-on-home] [--activity-match-external]",

                "    [--receiver-registered-only] [--receiver-replace-pending]",

                "    [--receiver-foreground] [--receiver-no-abort]",

                "    [--receiver-include-background]",