diff options
| author | Kevin Lin <linkevin@google.com> | 2014-01-28 01:21:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-28 01:21:31 +0000 |
| commit | 669adddca65b7c41047feffd7bb646ca0f1b33f4 (patch) | |
| tree | 0daf29bddb01f2be878fb2c94a8f55f86f068f58 /chips | |
| parent | 6e3f5a05061ffa3cc4a0cf374fb0fe28e46f2e56 (diff) | |
| parent | 1376b739954cc61afc55770415745ccad97f51d6 (diff) | |
| download | android_frameworks_ex-669adddca65b7c41047feffd7bb646ca0f1b33f4.tar.gz android_frameworks_ex-669adddca65b7c41047feffd7bb646ca0f1b33f4.tar.bz2 android_frameworks_ex-669adddca65b7c41047feffd7bb646ca0f1b33f4.zip | |
am 1376b739: am 9bfa2a6b: am be8700bb: am 2e7571b5: Fixed NPE in BaseRecipientAdapter when constraint is null.
* commit '1376b739954cc61afc55770415745ccad97f51d6':
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() { |