diff options
| author | Kenny Root <kroot@google.com> | 2010-06-22 23:46:35 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2010-06-22 23:55:15 -0700 |
| commit | 24ca4545f3fa9ffaf0a84af11f1ab74cd14d232e (patch) | |
| tree | aa5991b445acd6879817f6dd1adf269897063f66 /core/java/android/text/StaticLayout.java | |
| parent | 8d1110383d4437eeebae337026cd91449e4e55a5 (diff) | |
Check for spanned before computing tab stops
Don't try to check for tab stop spans in non-Spanned text input.
Change-Id: I54d69c8e0246f5a38d0713a89b8b455a478285f0
Diffstat (limited to 'core/java/android/text/StaticLayout.java')
| -rw-r--r-- | core/java/android/text/StaticLayout.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/core/java/android/text/StaticLayout.java b/core/java/android/text/StaticLayout.java index 1646b9e271b1..44157de670f9 100644 --- a/core/java/android/text/StaticLayout.java +++ b/core/java/android/text/StaticLayout.java @@ -265,11 +265,13 @@ extends Layout if (hasTab == false) { hasTab = true; hasTabOrEmoji = true; - // First tab this para, check for tabstops - TabStopSpan[] spans = spanned.getSpans(paraStart, - paraEnd, TabStopSpan.class); - if (spans.length > 0) { - tabStops = new TabStops(TAB_INCREMENT, spans); + if (spanned != null) { + // First tab this para, check for tabstops + TabStopSpan[] spans = spanned.getSpans(paraStart, + paraEnd, TabStopSpan.class); + if (spans.length > 0) { + tabStops = new TabStops(TAB_INCREMENT, spans); + } } } if (tabStops != null) { |