diff options
author | Dirk Dougherty <ddougherty@google.com> | 2013-05-31 21:08:45 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-31 21:08:45 +0000 |
commit | 4fad5c176a245203c1f8d26397ef6cc838753357 (patch) | |
tree | 2be6f55c608dd3c6df393e74ec9b268e7c267c04 /core | |
parent | 3886fad5d1c50dd14b11185104401887bc129c7f (diff) | |
parent | 932fbcc817caba5e0825d13b800c423980910ca2 (diff) | |
download | frameworks_base-4fad5c176a245203c1f8d26397ef6cc838753357.zip frameworks_base-4fad5c176a245203c1f8d26397ef6cc838753357.tar.gz frameworks_base-4fad5c176a245203c1f8d26397ef6cc838753357.tar.bz2 |
Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs
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 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. |