diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2013-06-01 08:26:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-01 08:26:32 -0700 |
| commit | b18c725442e498a6447de37c3b9428b09837eda9 (patch) | |
| tree | 00168d9dba568bc59b678b53227039207dcc9204 /core/java/android | |
| parent | a75fb065aff42ff7671a5b418229294f43da5cf3 (diff) | |
| parent | a404a62951ad8a2d657a587feb12780e725296e3 (diff) | |
| download | frameworks_base-b18c725442e498a6447de37c3b9428b09837eda9.zip frameworks_base-b18c725442e498a6447de37c3b9428b09837eda9.tar.gz frameworks_base-b18c725442e498a6447de37c3b9428b09837eda9.tar.bz2 | |
am a404a629: am 6fe992d8: am 4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs
* commit 'a404a62951ad8a2d657a587feb12780e725296e3':
Doc change: restore warning not to abort NEW_OUTGOING_CALL.
Diffstat (limited to 'core/java/android')
| -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 6a08fbf..72b0a8b 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. |