diff options
| author | Alice Yang <alice@google.com> | 2013-04-26 14:37:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-26 14:37:55 -0700 |
| commit | 31b46a1c8d707ca384c044e3e996ced2a2e52dd4 (patch) | |
| tree | 0087a8f58db5256b85716cb434b465c1f2da40d8 | |
| parent | 0a3140bf243b406da59e74a32fec6929a94de24e (diff) | |
| parent | f881a0565252fe947775d499768ef6a46490348a (diff) | |
| download | android_frameworks_ex-31b46a1c8d707ca384c044e3e996ced2a2e52dd4.tar.gz android_frameworks_ex-31b46a1c8d707ca384c044e3e996ced2a2e52dd4.tar.bz2 android_frameworks_ex-31b46a1c8d707ca384c044e3e996ced2a2e52dd4.zip | |
am f881a056: Prevent NPE in chips
* commit 'f881a0565252fe947775d499768ef6a46490348a':
Prevent NPE in chips
| -rw-r--r-- | chips/src/com/android/ex/chips/RecipientEditTextView.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/chips/src/com/android/ex/chips/RecipientEditTextView.java b/chips/src/com/android/ex/chips/RecipientEditTextView.java index 62a60b0..d2e5806 100644 --- a/chips/src/com/android/ex/chips/RecipientEditTextView.java +++ b/chips/src/com/android/ex/chips/RecipientEditTextView.java @@ -417,6 +417,7 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements return sExcessTopPadding; } + @Override public <T extends ListAdapter & Filterable> void setAdapter(T adapter) { super.setAdapter(adapter); ((BaseRecipientAdapter) adapter) @@ -1459,6 +1460,7 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements return createAlternatesAdapter(currentChip); } + @Override protected void onPostExecute(final ListAdapter result) { int line = getLayout().getLineForOffset(getChipStart(currentChip)); int bottom; @@ -2490,10 +2492,12 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements addresses.add(createAddressText(chip.getEntry())); } } + final BaseRecipientAdapter adapter = (BaseRecipientAdapter) getAdapter(); + if (adapter == null) { + return null; + } RecipientAlternatesAdapter.getMatchingRecipients(getContext(), addresses, - ((BaseRecipientAdapter) getAdapter()).getAccount(), - new RecipientMatchCallback() { - + adapter.getAccount(), new RecipientMatchCallback() { @Override public void matchesFound(Map<String, RecipientEntry> entries) { final ArrayList<DrawableRecipientChip> replacements = |