diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2013-05-29 11:42:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-29 11:42:03 -0700 |
| commit | 91ea7882cdba6bef7918fcd4ff645a9693fdc861 (patch) | |
| tree | 67b082aa75f6c5e37a3e6e30ccce86a1362b225f /core | |
| parent | 828a77adf8845984189e88394ee9f12577aa063a (diff) | |
| parent | f64588a2ce6a0e4e76d7d48c47f82785553b13f3 (diff) | |
| download | frameworks_base-91ea7882cdba6bef7918fcd4ff645a9693fdc861.zip frameworks_base-91ea7882cdba6bef7918fcd4ff645a9693fdc861.tar.gz frameworks_base-91ea7882cdba6bef7918fcd4ff645a9693fdc861.tar.bz2 | |
am f64588a2: am de8ac602: am 963e3ec5: am 71d1af4a: am a284e201: Merge "Doc change: adjust description of NEW_OUTGOING_CALL." into jb-mr1.1-docs
* commit 'f64588a2ce6a0e4e76d7d48c47f82785553b13f3':
Doc change: adjust description of NEW_OUTGOING_CALL.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/content/Intent.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 001a65c..5cb856e 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -2270,7 +2270,7 @@ public class Intent implements Parcelable, Cloneable { /** * Broadcast Action: An outgoing call is about to be placed. * - * <p>The Intent will have the following extra value: + * <p>The Intent will have the following extra value:</p> * <ul> * <li><em>{@link android.content.Intent#EXTRA_PHONE_NUMBER}</em> - * the phone number originally intended to be dialed.</li> @@ -2289,8 +2289,6 @@ 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. |