Ensure layout in getExtendedPadding calls
There are cases in which getExtendedPaddingTop() and Bottom can get
called even without a valid layout. This patch just makes sure there
is some reasonable layout available.
Fix for bug 14819392 "java.lang.NullPointerException in
android.widget.TextView"
Change-Id: I203899402ddfe857a688b16b7855a8991eee82b7
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 9b3a1e0..3e1b674 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -1861,6 +1861,10 @@
return getCompoundPaddingTop();
}
+ if (mLayout == null) {
+ assumeLayout();
+ }
+
if (mLayout.getLineCount() <= mMaximum) {
return getCompoundPaddingTop();
}
@@ -1894,6 +1898,10 @@
return getCompoundPaddingBottom();
}
+ if (mLayout == null) {
+ assumeLayout();
+ }
+
if (mLayout.getLineCount() <= mMaximum) {
return getCompoundPaddingBottom();
}