commit 4c5ea10caf8b84ab05c2d032145a7a3a26aa9b51
author Raph Levien <raph@google.com> Tue Sep 02 21:53:25 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 02 21:53:26 2014 +0000
tree 242bc52eaaf321051035df29d8473b7184022073
parent 980d466342f2c4271ac3fee6751a6da7c3c35c4f
parent 463cf1aea84c6f27155b45f3df70ec2550afb6ab

Merge "Ensure layout in getExtendedPadding calls" into lmp-dev

core/java/android/widget/TextView.java

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();
         }