commit 1e64ec0ea4d29eeee91326635fdcd2c9c5c4447f
author Bryce Lee <brycelee@google.com> Tue May 23 19:46:59 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue May 23 20:43:48 2017 +0000
tree 1d19eb796c0ca8123e61379317b38b48d9bd8c99
parent a653e56e799bb16ecdd154fe62978d2068e0a942

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

This reverts commit 8b49a5c0aa18f70bc59b972e888d5ad455e4d7ca.

Change-Id: I7d2da4ac72ca578942b38fccf8b151f3a2ed081f
(cherry picked from commit 25ae100cb0cf4bb8e4bb0be59e1221b2ca42a372)

core/java/android/app/ContextImpl.java

diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java
index a155de3..268a105b 100644
--- a/core/java/android/app/ContextImpl.java
+++ b/core/java/android/app/ContextImpl.java
@@ -846,9 +846,8 @@
         // 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."