commit 8ede04dbd5c09fa6a350e7af2aa49a0bde71725b
author Alice Yang <alice@google.com> Mon Mar 04 19:54:00 2013 -0800
committer Alice Yang <alice@google.com> Mon Mar 04 19:54:00 2013 -0800
tree 23338620916945352f65dfd8d8c61b1ae6ca4cec
parent 2416ccd3f57e9eaf7ddda487b29964437514e389
parent c4d46df70d525cb2289bd76fb0b0b12637dbbe23

resolved conflicts for merge of c4d46df7 to jb-mr2-dev

Change-Id: I8d4c64832f989c70ef432730ab584e3dc71ad004

chips/src/com/android/ex/chips/RecipientEditTextView.java

diff --git a/chips/src/com/android/ex/chips/RecipientEditTextView.java b/chips/src/com/android/ex/chips/RecipientEditTextView.java
index 8fe6dbf..8b8b2d3 100644
--- a/chips/src/com/android/ex/chips/RecipientEditTextView.java
+++ b/chips/src/com/android/ex/chips/RecipientEditTextView.java
@@ -2281,7 +2281,7 @@
         }
     }
 
-    public boolean lastCharacterIsCommitCharacter(CharSequence s) {
+   public boolean lastCharacterIsCommitCharacter(CharSequence s) {
         char last;
         int end = getSelectionEnd() == 0 ? 0 : getSelectionEnd() - 1;
         int len = length() - 1;
@@ -2488,8 +2488,8 @@
                                     new ArrayList<RecipientChip>();
                             for (final RecipientChip temp : recipients) {
                                 RecipientEntry entry = null;
-                                if (RecipientEntry.isCreatedRecipient(temp.getEntry()
-                                        .getContactId())
+                                if (temp != null && RecipientEntry.isCreatedRecipient(
+                                        temp.getEntry().getContactId())
                                         && getSpannable().getSpanStart(temp) != -1) {
                                     // Replace this.
                                     entry = createValidatedEntry(