summaryrefslogtreecommitdiffstats
path: root/chips/src/com/android
diff options
context:
space:
mode:
authorAlice Yang <alice@google.com>2013-03-04 16:38:17 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-04 16:38:17 -0800
commite6fee79da937b1ebad3f44ea11274f0b9f80e4ab (patch)
tree6f23b81c2319219c8620608980af3be2163b2b80 /chips/src/com/android
parent4b77fac23c07c7e49df796cf7de83d6a4aa90ae2 (diff)
parent48ad5213e18a67b3a7ec3375214e3900240b889c (diff)
downloadandroid_frameworks_ex-e6fee79da937b1ebad3f44ea11274f0b9f80e4ab.tar.gz
android_frameworks_ex-e6fee79da937b1ebad3f44ea11274f0b9f80e4ab.tar.bz2
android_frameworks_ex-e6fee79da937b1ebad3f44ea11274f0b9f80e4ab.zip
am 48ad5213: Fix NPE.
* commit '48ad5213e18a67b3a7ec3375214e3900240b889c': Fix NPE.
Diffstat (limited to 'chips/src/com/android')
-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 bfd380a..fdd6265 100644
--- a/chips/src/com/android/ex/chips/RecipientEditTextView.java
+++ b/chips/src/com/android/ex/chips/RecipientEditTextView.java
@@ -2508,8 +2508,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()));