Merge "add page for google IO videos this is a scrappy page with inline styles and such as a first iteration. plan is to clean this up and make it extensible later" into jb-mr1.1-ub-dev
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index cf0603e..6a08fbf 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -2231,7 +2231,7 @@
/**
* 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,11 +2250,13 @@
* 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.
+ * <p>Some apps (such as VoIP apps) may want to redirect the outgoing
+ * call to use their own service instead. Those apps should first prevent
+ * the call from being placed by setting resultData to <code>null</code>
+ * and then start their own app to make the call.
* <p>You must hold the
* {@link android.Manifest.permission#PROCESS_OUTGOING_CALLS}
* permission to receive this Intent.</p>