diff options
| author | Ricardo Cervera <rcervera@google.com> | 2014-04-04 11:17:06 -0700 |
|---|---|---|
| committer | Ricardo Cervera <rcervera@google.com> | 2015-01-16 09:24:30 -0800 |
| commit | 97c4ba9862006e2c9f4cea07f55dc7120d305e5a (patch) | |
| tree | 764f2c6ad28b9199ead3d09efa230b30701fd3eb /core/java/android/content/Intent.java | |
| parent | 3212c3aa226f8cc7cf54e72772a001906fd4d7c3 (diff) | |
| download | frameworks_base-97c4ba9862006e2c9f4cea07f55dc7120d305e5a.zip frameworks_base-97c4ba9862006e2c9f4cea07f55dc7120d305e5a.tar.gz frameworks_base-97c4ba9862006e2c9f4cea07f55dc7120d305e5a.tar.bz2 | |
docs: Added info on noHistory and onActivityResult().
Bug: 13807256
Cherry-pick from Iae4901a311e76401396f89c552e5b27a49c65c83
Change-Id: I4ad7aea1a3c7ea82bc2bbcdf35d2de418ef7b90f
Diffstat (limited to 'core/java/android/content/Intent.java')
| -rw-r--r-- | core/java/android/content/Intent.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index af6f181..7ce4d8d 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -3535,6 +3535,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; /** |