summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/content/Intent.java4
-rw-r--r--core/java/android/view/View.java4
2 files changed, 3 insertions, 5 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.
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index d2cc93b..01d80ac 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -12362,8 +12362,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
/**
* <p>Specifies the type of layer backing this view. The layer can be
- * {@link #LAYER_TYPE_NONE disabled}, {@link #LAYER_TYPE_SOFTWARE software} or
- * {@link #LAYER_TYPE_HARDWARE hardware}.</p>
+ * {@link #LAYER_TYPE_NONE}, {@link #LAYER_TYPE_SOFTWARE} or
+ * {@link #LAYER_TYPE_HARDWARE}.</p>
*
* <p>A layer is associated with an optional {@link android.graphics.Paint}
* instance that controls how the layer is composed on screen. The following