From 92f6a747085b4b5ed692de4bdb0050c096eae393 Mon Sep 17 00:00:00 2001
From: Ricardo Cervera <rcervera@google.com>
Date: Fri, 4 Apr 2014 11:17:06 -0700
Subject: docs: Added info on noHistory and onActivityResult(). Bug: 13807256

Change-Id: Iae4901a311e76401396f89c552e5b27a49c65c83
---
 core/java/android/content/Intent.java | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'core/java/android/content')

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 @@ public class Intent implements Parcelable, Cloneable {
      * 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;
     /**
-- 
cgit v1.1