summaryrefslogtreecommitdiffstats
path: root/chips
diff options
context:
space:
mode:
authorKevin Lin <linkevin@google.com>2014-01-28 01:17:53 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-28 01:17:53 +0000
commit1376b739954cc61afc55770415745ccad97f51d6 (patch)
tree9f34aa007e8dfe6b5bb267441597283ea2ccc53c /chips
parent51401366c84d0285d69b7a967d14465a4702671d (diff)
parent9bfa2a6bc36323788de552ffc0c1960e51dcb4e9 (diff)
downloadandroid_frameworks_ex-1376b739954cc61afc55770415745ccad97f51d6.tar.gz
android_frameworks_ex-1376b739954cc61afc55770415745ccad97f51d6.tar.bz2
android_frameworks_ex-1376b739954cc61afc55770415745ccad97f51d6.zip
am 9bfa2a6b: am be8700bb: am 2e7571b5: Fixed NPE in BaseRecipientAdapter when constraint is null.
* commit '9bfa2a6bc36323788de552ffc0c1960e51dcb4e9': Fixed NPE in BaseRecipientAdapter when constraint is null.
Diffstat (limited to 'chips')
-rw-r--r--chips/src/com/android/ex/chips/BaseRecipientAdapter.java5
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() {