summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlice Yang <alice@google.com>2013-03-05 20:56:34 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-05 20:56:34 +0000
commit2a7f40a289501e749edc017ddc02e627bbe4fd0f (patch)
tree9bdf69183a592cd7afa75c7a1c9bd8cbe8e636de
parent8ede04dbd5c09fa6a350e7af2aa49a0bde71725b (diff)
parent48ad5213e18a67b3a7ec3375214e3900240b889c (diff)
downloadandroid_frameworks_ex-2a7f40a289501e749edc017ddc02e627bbe4fd0f.tar.gz
android_frameworks_ex-2a7f40a289501e749edc017ddc02e627bbe4fd0f.tar.bz2
android_frameworks_ex-2a7f40a289501e749edc017ddc02e627bbe4fd0f.zip
am 48ad5213: Fix NPE.
* commit '48ad5213e18a67b3a7ec3375214e3900240b889c': Fix NPE.
-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 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 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements
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()));