am 677687c2: am edbab7b5: Merge "no layout = no visibility" into klp-dev

* commit '677687c20864d4af9c24614f22aae035c0c07ce6': no layout = no visibility
2013-10-14 10:12:01 -07:00
parent 4c33396508 677687c208
commit 4c4a469cbf
1 changed files with 2 additions and 0 deletions
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -800,6 +800,8 @@ public class Editor {

    private boolean isOffsetVisible(int offset) {
        Layout layout = mTextView.getLayout();
+        if (layout == null) return false;
+
        final int line = layout.getLineForOffset(offset);
        final int lineBottom = layout.getLineBottom(line);
        final int primaryHorizontal = (int) layout.getPrimaryHorizontal(offset);