From cee2051adac53a85653ba8ead3a671c0978af43b Mon Sep 17 00:00:00 2001 From: Martin Wallgren Date: Thu, 7 Apr 2011 14:45:43 +0200 Subject: CHAR_SEQUENCE_CREATOR cannot handle null string TextUtils.writeToParcel can handle null as input CharSequence but createFromParcel will throw NullPointerException. Transforming to and from parcel should handle null in the same way. Change-Id: I707ea9be2091d2655c5f63eaa57c5674befa5ad3 --- core/java/android/text/TextUtils.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'core/java/android/text/TextUtils.java') diff --git a/core/java/android/text/TextUtils.java b/core/java/android/text/TextUtils.java index 8675d05f3116..0d7aa02b47e1 100644 --- a/core/java/android/text/TextUtils.java +++ b/core/java/android/text/TextUtils.java @@ -627,10 +627,16 @@ public class TextUtils { public CharSequence createFromParcel(Parcel p) { int kind = p.readInt(); - if (kind == 1) - return p.readString(); + String string = p.readString(); + if (string == null) { + return null; + } + + if (kind == 1) { + return string; + } - SpannableString sp = new SpannableString(p.readString()); + SpannableString sp = new SpannableString(string); while (true) { kind = p.readInt(); -- cgit v1.2.3