Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 367b880c02

Change-Id: I0a0d96048c0b3dd504d0c90dbf80a8299c4b96a4
This commit is contained in:
Bryce Lee
2017-05-23 19:56:04 +00:00
committed by android-build-merger
parent e9f414237a 367b880c02
commit 272b3903ef
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/app/ContextImpl.java
View File

@@ -846,9 +846,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."