diff options
| author | Kevin Lin <linkevin@google.com> | 2014-01-28 01:12:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-28 01:12:46 +0000 |
| commit | be8700bbd9bc15b0e6798149e9a68059da5b27a9 (patch) | |
| tree | 9f34aa007e8dfe6b5bb267441597283ea2ccc53c /chips | |
| parent | 263ca4e5a6babb5a71b768d7a55a099ae824bd4c (diff) | |
| parent | 2e7571b5f06725a3a54a73bcc2c83a8b39c9da22 (diff) | |
| download | android_frameworks_ex-be8700bbd9bc15b0e6798149e9a68059da5b27a9.tar.gz android_frameworks_ex-be8700bbd9bc15b0e6798149e9a68059da5b27a9.tar.bz2 android_frameworks_ex-be8700bbd9bc15b0e6798149e9a68059da5b27a9.zip | |
am 2e7571b5: Fixed NPE in BaseRecipientAdapter when constraint is null.
* commit '2e7571b5f06725a3a54a73bcc2c83a8b39c9da22':
Fixed NPE in BaseRecipientAdapter when constraint is null.
Diffstat (limited to 'chips')
| -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() { |