commit 0159508d07186a3bf9fcc9a7227047f1bd82084d
author Scott Kennedy <skennedy@google.com> Tue Mar 05 03:27:20 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 05 03:27:20 2013 +0000
tree 26d8dd8808d1c22edecf8ca4f73b04c01e3b1f61
parent 48ad5213e18a67b3a7ec3375214e3900240b889c
parent 37aec262244072caea607146ba6d2f247ea2c20d

Merge "Fix some jank" into jb-ub-mail-ur8

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 d9b6394..43cb956 100644
--- a/chips/src/com/android/ex/chips/RecipientEditTextView.java
+++ b/chips/src/com/android/ex/chips/RecipientEditTextView.java
@@ -2508,8 +2508,8 @@
                                     new ArrayList<RecipientChip>(addresses.size());
 
                             for (final RecipientChip temp : recipients) {
-                                if (RecipientEntry.isCreatedRecipient(temp.getEntry()
-                                        .getContactId())
+                                if (temp != null && RecipientEntry.isCreatedRecipient(
+                                        temp.getEntry().getContactId())
                                         && getSpannable().getSpanStart(temp) != -1) {
                                     if (addresses.contains(temp.getEntry().getDestination())) {
                                         replacements.add(createFreeChip(temp.getEntry()));