diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2013-06-01 08:32:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-01 08:32:11 -0700 |
| commit | 8ebfb8c9c34caa80cd0d2451d950170c1b522f2a (patch) | |
| tree | 0c0ed41ca85b6362822f33f4ff50d526bc868a7c /core/java/android/content/Intent.java | |
| parent | 413adc9260d700bd8143950951c4e1ad07cbeddf (diff) | |
| parent | fdc0c8618b4e51c322f747202ff94508124e7c9c (diff) | |
| download | frameworks_base-8ebfb8c9c34caa80cd0d2451d950170c1b522f2a.zip frameworks_base-8ebfb8c9c34caa80cd0d2451d950170c1b522f2a.tar.gz frameworks_base-8ebfb8c9c34caa80cd0d2451d950170c1b522f2a.tar.bz2 | |
am fdc0c861: am b18c7254: am a404a629: am 6fe992d8: am 4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs
* commit 'fdc0c8618b4e51c322f747202ff94508124e7c9c':
Doc change: restore warning not to abort NEW_OUTGOING_CALL.
Diffstat (limited to 'core/java/android/content/Intent.java')
| -rw-r--r-- | core/java/android/content/Intent.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 5cb856e..fc95728 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -2289,6 +2289,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. |