diff options
| author | Scott Kennedy <skennedy@google.com> | 2013-08-01 11:10:41 -0700 |
|---|---|---|
| committer | Scott Kennedy <skennedy@google.com> | 2013-08-01 11:10:41 -0700 |
| commit | 4f8b198aeac24fbbc73fcb1fe644d520a7902939 (patch) | |
| tree | 844b6bae3cf20669f6a5dd51d752bcafe25552b2 | |
| parent | 3fc2d99dabce30def058bb34f97eb0947a1c8f52 (diff) | |
| parent | b6c18ed611a22d01e901d05911392d7cff89f783 (diff) | |
| download | android_frameworks_ex-4f8b198aeac24fbbc73fcb1fe644d520a7902939.tar.gz android_frameworks_ex-4f8b198aeac24fbbc73fcb1fe644d520a7902939.tar.bz2 android_frameworks_ex-4f8b198aeac24fbbc73fcb1fe644d520a7902939.zip | |
resolved conflicts for merge of b6c18ed6 to master
Change-Id: I7617af351d1fa7e4ce9ff401beffe21690b429d3
| -rw-r--r-- | chips/src/com/android/ex/chips/RecipientEditTextView.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/chips/src/com/android/ex/chips/RecipientEditTextView.java b/chips/src/com/android/ex/chips/RecipientEditTextView.java index 9721ed6..9fe4ab1 100644 --- a/chips/src/com/android/ex/chips/RecipientEditTextView.java +++ b/chips/src/com/android/ex/chips/RecipientEditTextView.java @@ -2493,10 +2493,6 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements } } final BaseRecipientAdapter adapter = (BaseRecipientAdapter) getAdapter(); - if (adapter == null) { - Log.wtf(TAG, "My assumption that this was fixed is wrong."); - return null; - } RecipientAlternatesAdapter.getMatchingRecipients(getContext(), adapter, addresses, adapter.getAccount(), new RecipientMatchCallback() { @Override |