From 2e7571b5f06725a3a54a73bcc2c83a8b39c9da22 Mon Sep 17 00:00:00 2001 From: Kevin Lin Date: Mon, 27 Jan 2014 15:58:40 -0800 Subject: Fixed NPE in BaseRecipientAdapter when constraint is null. BUG=12766155 Change-Id: I99cf03e33738ad804e35e7134c9d9a97c84be183 --- chips/src/com/android/ex/chips/BaseRecipientAdapter.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/chips/src/com/android/ex/chips/BaseRecipientAdapter.java b/chips/src/com/android/ex/chips/BaseRecipientAdapter.java index d52c7ca..531fd37 100644 --- a/chips/src/com/android/ex/chips/BaseRecipientAdapter.java +++ b/chips/src/com/android/ex/chips/BaseRecipientAdapter.java @@ -952,8 +952,11 @@ public abstract class BaseRecipientAdapter extends BaseAdapter implements Filter public View getView(int position, View convertView, ViewGroup parent) { final RecipientEntry entry = getEntries().get(position); + final String constraint = mCurrentConstraint == null ? null : + mCurrentConstraint.toString(); + return mDropdownChipLayouter.bindView(convertView, parent, entry, position, - AdapterType.BASE_RECIPIENT, mCurrentConstraint.toString()); + AdapterType.BASE_RECIPIENT, constraint); } public Account getAccount() { -- cgit v1.2.3