diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-21 16:34:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-21 16:34:37 -0700 |
| commit | 078bc317b741b601b857f64393e639df0e9a7dc4 (patch) | |
| tree | 1c826be1d2e694974461b0724e306c1ba8c20139 /core/java/android/content/Intent.java | |
| parent | 8487ab3e9f206ecf81f76283a627072781421091 (diff) | |
| parent | 43f8d2e58ce75d1705ad3ee347ae4eaee5dc9b6a (diff) | |
| download | frameworks_base-078bc317b741b601b857f64393e639df0e9a7dc4.zip frameworks_base-078bc317b741b601b857f64393e639df0e9a7dc4.tar.gz frameworks_base-078bc317b741b601b857f64393e639df0e9a7dc4.tar.bz2 | |
am 43f8d2e5: Merge change 8106 into donut
Merge commit '43f8d2e58ce75d1705ad3ee347ae4eaee5dc9b6a'
* commit '43f8d2e58ce75d1705ad3ee347ae4eaee5dc9b6a':
Add note to Intent.fillIn javadoc to describe component copying behavior.
Diffstat (limited to 'core/java/android/content/Intent.java')
| -rw-r--r-- | core/java/android/content/Intent.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 5be8100..66b507d 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -4535,6 +4535,9 @@ public class Intent implements Parcelable { * and {@link #FILL_IN_COMPONENT} to override the restriction where the * corresponding field will not be replaced if it is already set. * + * <p>Note: The component field will only be copied if {@link #FILL_IN_COMPONENT} is explicitly + * specified. + * * <p>For example, consider Intent A with {data="foo", categories="bar"} * and Intent B with {action="gotit", data-type="some/thing", * categories="one","two"}. |