diff options
| author | Ricardo Cervera <rcervera@google.com> | 2015-01-16 18:41:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-16 18:41:59 +0000 |
| commit | 083146428420dd3daa887d6e9c019e747a604cb5 (patch) | |
| tree | 555b1b4781bc1d5bbabd13acc74957cd66109130 /core/java/android/app/Activity.java | |
| parent | f5af4a1e34811730b1670ce686948e8dc182936b (diff) | |
| parent | 90312d808f4a5181b5cb99c78e64b7e5d1465895 (diff) | |
| download | frameworks_base-083146428420dd3daa887d6e9c019e747a604cb5.zip frameworks_base-083146428420dd3daa887d6e9c019e747a604cb5.tar.gz frameworks_base-083146428420dd3daa887d6e9c019e747a604cb5.tar.bz2 | |
am 90312d80: am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev
* commit '90312d808f4a5181b5cb99c78e64b7e5d1465895':
docs: Added info on noHistory and onActivityResult(). Bug: 13807256
Diffstat (limited to 'core/java/android/app/Activity.java')
| -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 fab88a2..38cd126 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -4785,6 +4785,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 * result came from. |