summaryrefslogtreecommitdiffstats
path: root/chips/src
diff options
context:
space:
mode:
authorMindy Pereira <mindyp@google.com>2012-06-28 11:47:48 -0700
committerMindy Pereira <mindyp@google.com>2012-06-28 11:47:48 -0700
commit1a71f76db0880a572b1443e8a0ac31a4bb584a8b (patch)
tree87d3aca0e802629c2ad8c79d4ebae7e555d547b0 /chips/src
parent9dd37058fa46c74d4cdc90f7562e4458dd8d37b3 (diff)
downloadandroid_frameworks_ex-1a71f76db0880a572b1443e8a0ac31a4bb584a8b.tar.gz
android_frameworks_ex-1a71f76db0880a572b1443e8a0ac31a4bb584a8b.tar.bz2
android_frameworks_ex-1a71f76db0880a572b1443e8a0ac31a4bb584a8b.zip
Check for null adapter.
If its not set, that would cause this crash in the monkey. Fixes b/6746348 java.lang.NullPointerException at com.android.ex.chips.RecipientEditTextView.isPhoneQuery(RecipientEditTextView.java:2574) Change-Id: I420bbae15180d0d53c674b00907bc361a519c165
Diffstat (limited to 'chips/src')
-rw-r--r--chips/src/com/android/ex/chips/RecipientEditTextView.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/chips/src/com/android/ex/chips/RecipientEditTextView.java b/chips/src/com/android/ex/chips/RecipientEditTextView.java
index bdc1a58..2011237 100644
--- a/chips/src/com/android/ex/chips/RecipientEditTextView.java
+++ b/chips/src/com/android/ex/chips/RecipientEditTextView.java
@@ -2544,7 +2544,8 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements
}
protected boolean isPhoneQuery() {
- return ((BaseRecipientAdapter)getAdapter()).getQueryType() ==
- BaseRecipientAdapter.QUERY_TYPE_PHONE;
+ return getAdapter() != null
+ && ((BaseRecipientAdapter) getAdapter()).getQueryType()
+ == BaseRecipientAdapter.QUERY_TYPE_PHONE;
}
}