diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2013-06-01 08:28:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-01 08:28:48 -0700 |
| commit | fdc0c8618b4e51c322f747202ff94508124e7c9c (patch) | |
| tree | 856f7d2ff045a1b919eb58babb93cc27a61c579a /core/java/android/content | |
| parent | 7356dde40439e2c787d28ed05aff4ff81d8a2d39 (diff) | |
| parent | b18c725442e498a6447de37c3b9428b09837eda9 (diff) | |
| download | frameworks_base-fdc0c8618b4e51c322f747202ff94508124e7c9c.zip frameworks_base-fdc0c8618b4e51c322f747202ff94508124e7c9c.tar.gz frameworks_base-fdc0c8618b4e51c322f747202ff94508124e7c9c.tar.bz2 | |
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 'b18c725442e498a6447de37c3b9428b09837eda9':
Doc change: restore warning not to abort NEW_OUTGOING_CALL.
Diffstat (limited to 'core/java/android/content')
| -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 b14326b..b7499c5 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. |