From 24ca4545f3fa9ffaf0a84af11f1ab74cd14d232e Mon Sep 17 00:00:00 2001
From: Kenny Root <kroot@google.com>
Date: Tue, 22 Jun 2010 23:46:35 -0700
Subject: [PATCH] Check for spanned before computing tab stops

Don't try to check for tab stop spans in non-Spanned text input.

Change-Id: I54d69c8e0246f5a38d0713a89b8b455a478285f0
---
 core/java/android/text/StaticLayout.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/core/java/android/text/StaticLayout.java b/core/java/android/text/StaticLayout.java
index 1646b9e271b15..44157de670f91 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) {