commit 2a7f40a289501e749edc017ddc02e627bbe4fd0f
author Alice Yang <alice@google.com> Tue Mar 05 20:56:34 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 05 20:56:34 2013 +0000
tree 9bdf69183a592cd7afa75c7a1c9bd8cbe8e636de
parent 8ede04dbd5c09fa6a350e7af2aa49a0bde71725b
parent 48ad5213e18a67b3a7ec3375214e3900240b889c

am 48ad5213: Fix NPE.

* commit '48ad5213e18a67b3a7ec3375214e3900240b889c':
  Fix NPE.

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 8b8b2d3..7e12530 100644
--- a/chips/src/com/android/ex/chips/RecipientEditTextView.java
+++ b/chips/src/com/android/ex/chips/RecipientEditTextView.java
@@ -2511,8 +2511,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()));