am 91ea7882: 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 '91ea7882cdba6bef7918fcd4ff645a9693fdc861':
  Doc change: adjust description of NEW_OUTGOING_CALL.
This commit is contained in:
Dirk Dougherty
2013-05-29 15:18:45 -07:00
committed by Android Git Automerger

View File

@@ -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.