summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Kennedy <skennedy@android.com>2013-03-14 11:44:08 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-14 11:44:08 -0700
commit35d3af70da9740a81eb8eda5a7f87e6f396fb151 (patch)
treea00952df1d0deba1da1f4ff55a5c2c651e13c56a
parente53461a8db44e66023b87a4b4f249e9fa4689366 (diff)
parent8682651d24b0c2cb733b4ef58982aa05f247b3d6 (diff)
downloadandroid_frameworks_ex-35d3af70da9740a81eb8eda5a7f87e6f396fb151.tar.gz
android_frameworks_ex-35d3af70da9740a81eb8eda5a7f87e6f396fb151.tar.bz2
android_frameworks_ex-35d3af70da9740a81eb8eda5a7f87e6f396fb151.zip
am 8682651d: Merge "Fix a Dead Loop issue in RecipientEditTextView"
* commit '8682651d24b0c2cb733b4ef58982aa05f247b3d6': Fix a Dead Loop issue in RecipientEditTextView
-rw-r--r--chips/src/com/android/ex/chips/RecipientEditTextView.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/chips/src/com/android/ex/chips/RecipientEditTextView.java b/chips/src/com/android/ex/chips/RecipientEditTextView.java
index 93ca4e8..925e5ce 100644
--- a/chips/src/com/android/ex/chips/RecipientEditTextView.java
+++ b/chips/src/com/android/ex/chips/RecipientEditTextView.java
@@ -2323,12 +2323,12 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements
int originalTokenStart = mTokenizer.findTokenStart(text, getSelectionEnd());
String lastAddress = text.substring(originalTokenStart);
int tokenStart = originalTokenStart;
- int prevTokenStart = tokenStart;
+ int prevTokenStart = 0;
RecipientChip findChip = null;
ArrayList<RecipientChip> created = new ArrayList<RecipientChip>();
if (tokenStart != 0) {
// There are things before this!
- while (tokenStart != 0 && findChip == null) {
+ while (tokenStart != 0 && findChip == null && tokenStart != prevTokenStart) {
prevTokenStart = tokenStart;
tokenStart = mTokenizer.findTokenStart(text, tokenStart);
findChip = findChip(tokenStart);