diff options
author | Kevin Lin <linkevin@google.com> | 2014-01-27 15:58:40 -0800 |
---|---|---|
committer | Kevin Lin <linkevin@google.com> | 2014-01-28 01:05:28 +0000 |
commit | 2e7571b5f06725a3a54a73bcc2c83a8b39c9da22 (patch) | |
tree | 1d52ad03081bc5df14f36568a1d1bcd009c99340 /chips/src/com/android/ex/chips/BaseRecipientAdapter.java | |
parent | 2b8b9029fd4e44447e59d7349c656cc32b2de9c7 (diff) | |
download | android_frameworks_ex-2e7571b5f06725a3a54a73bcc2c83a8b39c9da22.tar.gz android_frameworks_ex-2e7571b5f06725a3a54a73bcc2c83a8b39c9da22.tar.bz2 android_frameworks_ex-2e7571b5f06725a3a54a73bcc2c83a8b39c9da22.zip |
Fixed NPE in BaseRecipientAdapter when constraint is null.
BUG=12766155
Change-Id: I99cf03e33738ad804e35e7134c9d9a97c84be183
Diffstat (limited to 'chips/src/com/android/ex/chips/BaseRecipientAdapter.java')
-rw-r--r-- | chips/src/com/android/ex/chips/BaseRecipientAdapter.java | 5 |
1 files changed, 4 insertions, 1 deletions
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() { |