Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 078bc317 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by Android Git Automerger
Browse files

am 43f8d2e5: Merge change 8106 into donut 

Merge commit '43f8d2e5'

* commit '43f8d2e5':
  Add note to Intent.fillIn javadoc to describe component copying behavior.
parents 8487ab3e 43f8d2e5

core/java/android/content/Intent.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -4535,6 +4535,9 @@ public class Intent implements Parcelable { 
     * and {@link #FILL_IN_COMPONENT} to override the restriction where the

     * and {@link #FILL_IN_COMPONENT} to override the restriction where the

     * corresponding field will not be replaced if it is already set.

     * 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"}

     * <p>For example, consider Intent A with {data="foo", categories="bar"}

     * and Intent B with {action="gotit", data-type="some/thing",

     * and Intent B with {action="gotit", data-type="some/thing",

     * categories="one","two"}.

     * categories="one","two"}.