summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mark Renouf <mrenouf@google.com> 2017-01-10 17:53:08 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-01-10 17:53:11 +0000
commitfb5b1477819f7ae07bd110f8e134e56c6d72d53f (patch)
tree83334d7e7c4ca30cf963fb71538ea345fc940726
parentd07305a2bf9e76ff8f3f38cd088de352802c5673 (diff)
parentcca6d05fb4f37fa6e68e9ab2236a8cfda516f1a7 (diff)
Merge "Update javadoc for startActivityForResult(Intent, int, Bundle)"
-rw-r--r--core/java/android/app/Activity.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 2ccfe0e3b72d..0d9e8a0afad2 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -4341,8 +4341,8 @@ public class Activity extends ContextThemeWrapper
* that are defined to return a result. In other protocols (such as
* {@link Intent#ACTION_MAIN} or {@link Intent#ACTION_VIEW}), you may
* not get the result when you expect. For example, if the activity you
- * are launching uses the singleTask launch mode, it will not run in your
- * task and thus you will immediately receive a cancel result.
+ * are launching uses {@link Intent#FLAG_ACTIVITY_NEW_TASK}, it will not
+ * run in your task and thus you will immediately receive a cancel result.
*
* <p>As a special case, if you call startActivityForResult() with a requestCode
* >= 0 during the initial onCreate(Bundle savedInstanceState)/onResume() of your