summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dirk Dougherty <ddougherty@google.com> 2013-06-01 08:21:25 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2013-06-01 08:21:25 -0700
commit6fe992d88abc1c8c75ede638e6b0d52cd06f098f (patch)
tree2be6f55c608dd3c6df393e74ec9b268e7c267c04
parenteca0125267d453ab60631317a44abe869eb660fe (diff)
parent4fad5c176a245203c1f8d26397ef6cc838753357 (diff)
am 4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs
* commit '4fad5c176a245203c1f8d26397ef6cc838753357': Doc change: restore warning not to abort NEW_OUTGOING_CALL.
-rw-r--r--core/java/android/content/Intent.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index 6a08fbff7f83..72b0a8b939e6 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -2250,6 +2250,8 @@ public class Intent implements Parcelable, Cloneable {
* should have a positive priority.
* Negative priorities are reserved for the system for this broadcast;
* using them may cause problems.</p>
+ * <p>Any BroadcastReceiver receiving this Intent <em>must not</em>
+ * abort the broadcast.</p>
* <p>Emergency calls cannot be intercepted using this mechanism, and
* other calls cannot be modified to call emergency numbers using this
* mechanism.