chips: Only dereference a selected chip if user wasn't still editing.stable/cm-11.0-XNG3Cstable/cm-11.0-XNG2Scm-11.0

Change-Id: I748a984a76ec553c5de28c278074358d99336f52

1 files changed, 1 insertions, 1 deletions

diff --git a/chips/src/com/android/ex/chips/RecipientEditTextView.java b/chips/src/com/android/ex/chips/RecipientEditTextView.java
index 0a1cdff..59e4566 100644
--- a/chips/src/com/android/ex/chips/RecipientEditTextView.java
+++ b/chips/src/com/android/ex/chips/RecipientEditTextView.java
@@ -2085,7 +2085,6 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements
         int start = getChipStart(chip);
         int end = getChipEnd(chip);
         Editable editable = getText();
-        mSelectedChip = null;
         if (start == -1 || end == -1) {
             Log.w(TAG, "The chip doesn't exist or may be a chip a user was editing");
             setSelection(editable.length());
@@ -2102,6 +2101,7 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements
             } catch (NullPointerException e) {
                 Log.e(TAG, e.getMessage(), e);
             }
+            mSelectedChip = null;
         }
         setCursorVisible(true);
         setSelection(editable.length());