commit 1fb1fc2aa57473e58fcacdf41eaa2a032e783be8
author Kevin Lin <linkevin@google.com> Tue Jan 28 01:21:31 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 28 01:21:31 2014 +0000
tree b67e8a4742d6131f45dd6031d45c933760efcaae
parent 1ed5953836b00fcaf2343049769101cd090b47ae
parent b36a90cd323c06bf5e8642e07f9158fa16e02c2d

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.

src/com/android/ex/chips/BaseRecipientAdapter.java

diff --git a/src/com/android/ex/chips/BaseRecipientAdapter.java b/src/com/android/ex/chips/BaseRecipientAdapter.java
index d52c7ca..531fd37 100644
--- a/src/com/android/ex/chips/BaseRecipientAdapter.java
+++ b/src/com/android/ex/chips/BaseRecipientAdapter.java
@@ -952,8 +952,11 @@
     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() {