diff options
| author | 2013-05-28 22:23:11 -0700 | |
|---|---|---|
| committer | 2013-05-28 22:23:11 -0700 | |
| commit | f64588a2ce6a0e4e76d7d48c47f82785553b13f3 (patch) | |
| tree | d1add9330dba4971f8da2f99fc181b2b5a893158 | |
| parent | 57f0de12912c7412820b74e119c4a5e3ad2bc203 (diff) | |
| parent | de8ac602e3d74dbcb87dfc4c1cc54fb0553e5f17 (diff) | |
am de8ac602: am 963e3ec5: am 71d1af4a: am a284e201: Merge "Doc change: adjust description of NEW_OUTGOING_CALL." into jb-mr1.1-docs
* commit 'de8ac602e3d74dbcb87dfc4c1cc54fb0553e5f17':
Doc change: adjust description of NEW_OUTGOING_CALL.
| -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 8a84c490f283..b14326b699ca 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -2231,7 +2231,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> @@ -2250,8 +2250,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. |