diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2013-06-01 09:52:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-01 09:52:14 -0700 |
| commit | eb47aac14c584bb7326f48082b37cb0e0d0b500f (patch) | |
| tree | 9a265562d8fede52d75e7c0d326542faf1c559ba /core | |
| parent | 61b7e872bf043a1a23d847ada7063e6fdcf6ddad (diff) | |
| parent | 0f70bcfce3eb291e95e2a70f9d353efa862796da (diff) | |
| download | frameworks_base-eb47aac14c584bb7326f48082b37cb0e0d0b500f.zip frameworks_base-eb47aac14c584bb7326f48082b37cb0e0d0b500f.tar.gz frameworks_base-eb47aac14c584bb7326f48082b37cb0e0d0b500f.tar.bz2 | |
am 0f70bcfc: am 8ebfb8c9: 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 '0f70bcfce3eb291e95e2a70f9d353efa862796da':
Doc change: restore warning not to abort NEW_OUTGOING_CALL.
Diffstat (limited to 'core')
| -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 e25af70..897e6fe 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -2288,6 +2288,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. |