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

Commit 3ebe54b3 authored by Bryce Lee's avatar Bryce Lee Committed by Android (Google) Code Review
Browse files

Merge "Disallow starting activities without new task from non-activity context." into oc-dev

parents ed831398 8b49a5c0

core/java/android/app/ContextImpl.java

+3 −2
Original line number Diff line number Diff line
@@ -847,7 +847,8 @@ class ContextImpl extends Context { 
        // generally not allowed, except if the caller specifies the task id the activity should

        // be launched in.

        if ((intent.getFlags() & Intent.FLAG_ACTIVITY_NEW_TASK) == 0

                && options != null && ActivityOptions.fromBundle(options).getLaunchTaskId() == -1) {

                && (options == null

                || ActivityOptions.fromBundle(options).getLaunchTaskId() == -1)) {

            throw new AndroidRuntimeException(

                    "Calling startActivity() from outside of an Activity "

                    + " context requires the FLAG_ACTIVITY_NEW_TASK flag."