commit 92f6a747085b4b5ed692de4bdb0050c096eae393
author Ricardo Cervera <rcervera@google.com> Fri Apr 04 11:17:06 2014 -0700
committer Ricardo Cervera <rcervera@google.com> Wed Nov 05 08:55:51 2014 -0800
tree 471db3e49dbaeb2043b2ae1bdddebbab8661f375
parent aa7bcf140d95049f1482c896b770de7ba339f7c9

docs: Added info on noHistory and onActivityResult(). Bug: 13807256

Change-Id: Iae4901a311e76401396f89c552e5b27a49c65c83

core/java/android/content/Intent.java

diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index 3c66b68..ad2312a 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -3400,6 +3400,10 @@
      * the user navigates away from it, the activity is finished.  This may also
      * be set with the {@link android.R.styleable#AndroidManifestActivity_noHistory
      * noHistory} attribute.
+     *
+     * <p>If set, {@link android.app.Activity#onActivityResult onActivityResult()}
+     * is never invoked when the current activity starts a new activity which
+     * sets a result and finishes.
      */
     public static final int FLAG_ACTIVITY_NO_HISTORY = 0x40000000;
     /**