diff options
| author | Ricardo Cervera <rcervera@google.com> | 2014-04-04 11:17:06 -0700 |
|---|---|---|
| committer | Ricardo Cervera <rcervera@google.com> | 2014-11-05 08:55:51 -0800 |
| commit | 92f6a747085b4b5ed692de4bdb0050c096eae393 (patch) | |
| tree | 471db3e49dbaeb2043b2ae1bdddebbab8661f375 /core/java/android/app | |
| parent | aa7bcf140d95049f1482c896b770de7ba339f7c9 (diff) | |
| download | frameworks_base-92f6a747085b4b5ed692de4bdb0050c096eae393.zip frameworks_base-92f6a747085b4b5ed692de4bdb0050c096eae393.tar.gz frameworks_base-92f6a747085b4b5ed692de4bdb0050c096eae393.tar.bz2 | |
docs: Added info on noHistory and onActivityResult(). Bug: 13807256
Change-Id: Iae4901a311e76401396f89c552e5b27a49c65c83
Diffstat (limited to 'core/java/android/app')
| -rw-r--r-- | core/java/android/app/Activity.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index d6db8c2..cdfd6f2 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -4316,6 +4316,10 @@ public class Activity extends ContextThemeWrapper * * <p>You will receive this call immediately before onResume() when your * activity is re-starting. + * + * <p>This method is never invoked if your activity sets + * {@link android.R.styleable#AndroidManifestActivity_noHistory noHistory} to + * <code>true</code>. * * @param requestCode The integer request code originally supplied to * startActivityForResult(), allowing you to identify who this |