Revert "Disallow starting activities without new task from non-activity context."

This reverts commit 8b49a5c0aa.

Change-Id: I7d2da4ac72ca578942b38fccf8b151f3a2ed081f
This commit is contained in:
Bryce Lee
2017-05-23 19:46:59 +00:00
parent 8b49a5c0aa
commit 25ae100cb0

View File

@@ -843,9 +843,8 @@ class ContextImpl extends Context {
// Calling start activity from outside an activity without FLAG_ACTIVITY_NEW_TASK is
// 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)) {
if ((intent.getFlags()&Intent.FLAG_ACTIVITY_NEW_TASK) == 0
&& 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."