am 425db473: Merge "CHAR_SEQUENCE_CREATOR cannot handle null string"

* commit '425db473a05e4204301bf46d4ab6f51b12d9c447':
  CHAR_SEQUENCE_CREATOR cannot handle null string

1 files changed, 9 insertions, 3 deletions

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