summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/java/android/view/View.java13
1 files changed, 10 insertions, 3 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index eefce0694af2..ae06888addc1 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -6665,7 +6665,14 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
* view specifying how it should be arranged. There are many subclasses of
* ViewGroup.LayoutParams, and these correspond to the different subclasses
* of ViewGroup that are responsible for arranging their children.
- * @return The LayoutParams associated with this view
+ *
+ * This method may return null if this View is not attached to a parent
+ * ViewGroup or {@link #setLayoutParams(android.view.ViewGroup.LayoutParams)}
+ * was not invoked successfully. When a View is attached to a parent
+ * ViewGroup, this method must not return null.
+ *
+ * @return The LayoutParams associated with this view, or null if no
+ * parameters have been set yet
*/
@ViewDebug.ExportedProperty(deepExport = true, prefix = "layout_")
public ViewGroup.LayoutParams getLayoutParams() {
@@ -6679,11 +6686,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
* correspond to the different subclasses of ViewGroup that are responsible
* for arranging their children.
*
- * @param params the layout parameters for this view
+ * @param params The layout parameters for this view, cannot be null
*/
public void setLayoutParams(ViewGroup.LayoutParams params) {
if (params == null) {
- throw new NullPointerException("params == null");
+ throw new NullPointerException("Layout parameters cannot be null");
}
mLayoutParams = params;
requestLayout();