diff options
author | Dirk Dougherty <ddougherty@google.com> | 2013-05-29 05:16:00 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-29 05:16:01 +0000 |
commit | a284e2013af9624f0093d58ea8d14994c8eda316 (patch) | |
tree | e814ac21c203e6826a67163692544e77586490cb | |
parent | 7fb15ce74bbc06c88660440f84845a1f3108c3d3 (diff) | |
parent | 367ce906c84f68621663aa8bbcf24af7e024adfa (diff) | |
download | frameworks_base-a284e2013af9624f0093d58ea8d14994c8eda316.zip frameworks_base-a284e2013af9624f0093d58ea8d14994c8eda316.tar.gz frameworks_base-a284e2013af9624f0093d58ea8d14994c8eda316.tar.bz2 |
Merge "Doc change: adjust description of NEW_OUTGOING_CALL." into jb-mr1.1-docs
-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 6f41fb3..6a08fbf 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. |