diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-21 16:32:14 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-21 16:32:14 -0700 |
| commit | 43f8d2e58ce75d1705ad3ee347ae4eaee5dc9b6a (patch) | |
| tree | b2ff275f57dd041403773aba96e1556f80edffb1 /core/java/android | |
| parent | 841ed8596a745d90822467bc2c0e13880bb59cc9 (diff) | |
| parent | 3e391759d9e7e99fd5ab2d5400bf5acdd54dc808 (diff) | |
| download | frameworks_base-43f8d2e58ce75d1705ad3ee347ae4eaee5dc9b6a.zip frameworks_base-43f8d2e58ce75d1705ad3ee347ae4eaee5dc9b6a.tar.gz frameworks_base-43f8d2e58ce75d1705ad3ee347ae4eaee5dc9b6a.tar.bz2 | |
Merge change 8106 into donut
* changes:
Add note to Intent.fillIn javadoc to describe component copying behavior.
Diffstat (limited to 'core/java/android')
| -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 b0dbfcb..a5f298c 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -4513,6 +4513,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"}. |