From 3e391759d9e7e99fd5ab2d5400bf5acdd54dc808 Mon Sep 17 00:00:00 2001
From: Brett Chabot <brettchabot@google.com>
Date: Tue, 21 Jul 2009 16:07:23 -0700
Subject: Add note to Intent.fillIn javadoc to describe component copying
 behavior.

---
 core/java/android/content/Intent.java | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'core/java/android')

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"}.
-- 
cgit v1.1