summaryrefslogtreecommitdiffstats
path: root/core/java/android/text/util
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-06-03 09:03:58 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2010-06-03 09:03:58 -0700
commitee7e6a78e28b360826f215e0e84d43b1513b6401 (patch)
tree704c72b88fd367184c094d78bedd05a3924d5f47 /core/java/android/text/util
parent105e1c5adc3da14996d659ac403e7254b81bcb76 (diff)
parente99c012503bbd205cbaa9f16f9894ca5ffeaaf76 (diff)
downloadframeworks_base-ee7e6a78e28b360826f215e0e84d43b1513b6401.zip
frameworks_base-ee7e6a78e28b360826f215e0e84d43b1513b6401.tar.gz
frameworks_base-ee7e6a78e28b360826f215e0e84d43b1513b6401.tar.bz2
merge from open-source master
Change-Id: Idf8d5661d7b261b74ac0b1271af98795ac5faff9
Diffstat (limited to 'core/java/android/text/util')
-rw-r--r--core/java/android/text/util/Rfc822Tokenizer.java12
1 files changed, 8 insertions, 4 deletions
diff --git a/core/java/android/text/util/Rfc822Tokenizer.java b/core/java/android/text/util/Rfc822Tokenizer.java
index 952d833..69cf93c 100644
--- a/core/java/android/text/util/Rfc822Tokenizer.java
+++ b/core/java/android/text/util/Rfc822Tokenizer.java
@@ -84,8 +84,10 @@ public class Rfc822Tokenizer implements MultiAutoCompleteTextView.Tokenizer {
if (c == '"') {
i++;
break;
- } else if (c == '\\' && i + 1 < cursor) {
- name.append(text.charAt(i + 1));
+ } else if (c == '\\') {
+ if (i + 1 < cursor) {
+ name.append(text.charAt(i + 1));
+ }
i += 2;
} else {
name.append(c);
@@ -110,8 +112,10 @@ public class Rfc822Tokenizer implements MultiAutoCompleteTextView.Tokenizer {
comment.append(c);
level++;
i++;
- } else if (c == '\\' && i + 1 < cursor) {
- comment.append(text.charAt(i + 1));
+ } else if (c == '\\') {
+ if (i + 1 < cursor) {
+ comment.append(text.charAt(i + 1));
+ }
i += 2;
} else {
comment.append(c);